diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-17 12:58:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-17 12:58:00 +0100 |
| commit | abf91f7fee326fae0d70ca1a481c51e8eab1dd5e (patch) | |
| tree | 179d094e8c4e8776ceb63422b2b324aa9f4c4aa0 | |
| parent | cb8c5e531c8d6b9d7a3efad4186df59efc043345 (diff) | |
| parent | 8f5587c3d0bc4b5f075e4282215bda91a21fc12e (diff) | |
| download | ffmpeg-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>
| -rw-r--r-- | libavutil/version.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index 67a0b7c783..3f82a974c5 100644 --- a/libavutil/version.h +++ b/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 /** * @} |