Merge commit '8f5587c3d0bc4b5f075e4282215bda91a21fc12e'

* commit '8f5587c3d0bc4b5f075e4282215bda91a21fc12e':
  cpu.h: define AV_CPU_FLAG_MMX2 for libavutil major 52
  h264: Fix parameters to ff_er_add_slice() call
  h264: always check ref_count for validity

Conflicts:
	libavcodec/h264.c
	libavutil/cpu.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavutil/version.h

@@ -123,6 +123,9 @@
 #ifndef FF_API_AUDIOCONVERT
 #define FF_API_AUDIOCONVERT             (LIBAVUTIL_VERSION_MAJOR < 53)
 #endif
+#ifndef FF_API_CPU_FLAG_MMX2
+#define FF_API_CPU_FLAG_MMX2            (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
 
 /**
  * @}