lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h

It's for internal use only.

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 76b3fc4..9d63e32 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1187,7 +1187,9 @@ typedef struct AVCodecContext {
      */
     int coded_width, coded_height;
 
      */
     int coded_width, coded_height;
 

+#if FF_API_ASPECT_EXTENDED

 #define FF_ASPECT_EXTENDED 15
 #define FF_ASPECT_EXTENDED 15

+#endif

 
     /**
      * the number of pictures in a group of pictures, or 0 for intra_only
 
     /**
      * 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 4f58f92..c6ad618 100644 (file)
--- a/libavcodec/h263.h
+++ b/libavcodec/h263.h
@@ -26,6 +26,10 @@
 #include "mpegvideo.h"
 #include "rl.h"
 
 #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
 // 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 bf0ed73..05ac33e 100644 (file)
--- 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_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 */
 
 #endif /* AVCODEC_VERSION_H */