Merge commit '8f5587c3d0bc4b5f075e4282215bda91a21fc12e'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Nov 2012 11:58:00 +0000 (12:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Nov 2012 11:58:00 +0000 (12:58 +0100)
* 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>
1  2 
libavutil/version.h

Simple merge