diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 19:19:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 19:20:02 +0100 |
| commit | 382545ae62ca2cd5ae75b4e951e7ad659e3cc5fb (patch) | |
| tree | 0bbdf6132a5423b9dea6f3570bd5d23c933ce192 | |
| parent | 935d0ee08d0ef964c02556fc694f1e8b3b69d7d4 (diff) | |
| parent | 28240a60c1b5ce276e947ba013271ec009adc078 (diff) | |
| download | ffmpeg-382545ae62ca2cd5ae75b4e951e7ad659e3cc5fb.tar.gz | |
Merge commit '28240a60c1b5ce276e947ba013271ec009adc078'
* commit '28240a60c1b5ce276e947ba013271ec009adc078':
lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 89bc3016a5..df52b789be 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1326,7 +1326,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 099549435e..dfefea9364 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 8638792dfb..ac3af67210 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -112,5 +112,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 */ |