diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 13:27:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 13:49:02 +0100 |
| commit | d67d3e29779ac113fbf806754ef9398e52cd288b (patch) | |
| tree | ae66a68d7a5938f188952671bbeb4fcbb7bfd667 | |
| parent | b71e4d8717450e6d6d08125fbd24a74f082dff71 (diff) | |
| parent | b45c87083de67969c1598cfef41e7c947b137922 (diff) | |
| download | ffmpeg-d67d3e29779ac113fbf806754ef9398e52cd288b.tar.gz | |
Merge commit 'b45c87083de67969c1598cfef41e7c947b137922'
* commit 'b45c87083de67969c1598cfef41e7c947b137922':
lavc: schedule unused FF_QSCALE_TYPE_* for removal on next bump
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 59ab70ddca..df0ec13385 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -904,10 +904,12 @@ typedef struct AVPanScan{ int16_t position[3][2]; }AVPanScan; +#if FF_API_QSCALE_TYPE #define FF_QSCALE_TYPE_MPEG1 0 #define FF_QSCALE_TYPE_MPEG2 1 #define FF_QSCALE_TYPE_H264 2 #define FF_QSCALE_TYPE_VP56 3 +#endif #if FF_API_GET_BUFFER #define FF_BUFFER_TYPE_INTERNAL 1 diff --git a/libavcodec/version.h b/libavcodec/version.h index b7396dec97..45a782fba8 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -123,5 +123,8 @@ #ifndef FF_API_ERROR_RATE #define FF_API_ERROR_RATE (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_QSCALE_TYPE +#define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 56) +#endif #endif /* AVCODEC_VERSION_H */ |