diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-10-27 11:54:34 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-10-31 20:24:48 +0100 |
| commit | 28240a60c1b5ce276e947ba013271ec009adc078 (patch) | |
| tree | 9b70c7396ad4745e39dd55938ac679df561b51a1 | |
| parent | eb5920c195d1b0bda81782af4ba0c5982f5225b3 (diff) | |
lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h
It's for internal use only.
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/h263.h | 4 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 76b3fc411f..9d63e32c25 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1187,7 +1187,9 @@ typedef struct AVCodecContext { */ int coded_width, coded_height; +#if FF_API_ASPECT_EXTENDED #define FF_ASPECT_EXTENDED 15 +#endif /** * the number of pictures in a group of pictures, or 0 for intra_only diff --git a/libavcodec/h263.h b/libavcodec/h263.h index 4f58f92bd6..c6ad618fa1 100644 --- a/libavcodec/h263.h +++ b/libavcodec/h263.h @@ -26,6 +26,10 @@ #include "mpegvideo.h" #include "rl.h" +#if !FF_API_ASPECT_EXTENDED +#define FF_ASPECT_EXTENDED 15 +#endif + // The defines below define the number of bits that are read at once for // reading vlc values. Changing these may improve speed and data cache needs // be aware though that decreasing them may need the number of stages that is diff --git a/libavcodec/version.h b/libavcodec/version.h index bf0ed7339d..05ac33e033 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -85,5 +85,8 @@ #ifndef FF_API_OLD_MSMPEG4 #define FF_API_OLD_MSMPEG4 (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_ASPECT_EXTENDED +#define FF_API_ASPECT_EXTENDED (LIBAVCODEC_VERSION_MAJOR < 56) +#endif #endif /* AVCODEC_VERSION_H */ |