Merge commit '28240a60c1b5ce276e947ba013271ec009adc078'

* commit '28240a60c1b5ce276e947ba013271ec009adc078':
  lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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 */