[FFmpeg-cvslog] Merge commit '8f5587c3d0bc4b5f075e4282215bda91a21fc12e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 17 12:58:00 2012 +0100| [abf91f7fee326fae0d70ca1a481c51e8eab1dd5e] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=abf91f7fee326fae0d70ca1a481c51e8eab1dd5e
---