aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-17 12:58:00 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-17 12:58:00 +0100
commitabf91f7fee326fae0d70ca1a481c51e8eab1dd5e (patch)
tree179d094e8c4e8776ceb63422b2b324aa9f4c4aa0 /tests
parentcb8c5e531c8d6b9d7a3efad4186df59efc043345 (diff)
parent8f5587c3d0bc4b5f075e4282215bda91a21fc12e (diff)
downloadffmpeg-abf91f7fee326fae0d70ca1a481c51e8eab1dd5e.tar.gz
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>
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions