diff avcodec.h @ 880:1c32039e7215 libavcodec

aspect ratio cleanup

--- a/avcodec.h	Wed Nov 20 07:32:18 2002 +0000
+++ b/avcodec.h	Wed Nov 20 13:08:04 2002 +0000
@@ -5,8 +5,8 @@
 
 #define LIBAVCODEC_VERSION_INT 0x000406
 #define LIBAVCODEC_VERSION     "0.4.6"
-#define LIBAVCODEC_BUILD       4639
-#define LIBAVCODEC_BUILD_STR   "4639"
+#define LIBAVCODEC_BUILD       4640
+#define LIBAVCODEC_BUILD_STR   "4640"
 
 enum CodecID {
     CODEC_ID_NONE, 
@@ -145,6 +145,7 @@
 #define CODEC_FLAG_NORMALIZE_AQP  0x00020000 /* normalize adaptive quantization */
 #define CODEC_FLAG_INTERLACED_DCT 0x00040000 /* use interlaced dct */
 #define CODEC_FLAG_LOW_DELAY      0x00080000 /* force low delay / will fail on b frames */
+#define CODEC_FLAG_ALT_SCAN       0x00100000 /* use alternate scan */
 
 /* codec capabilities */
 
@@ -222,8 +223,7 @@
     int width, height;
     
     /**
-     * encoding: set by user. 0 if not known
-     * decoding: set by lavc. 0 if not known
+     * Obsolete, will be removed
      */
     int aspect_ratio_info;
 #define FF_ASPECT_SQUARE 1
@@ -646,9 +646,7 @@
     float rc_initial_cplx;
 
     /**
-     * custom aspect ratio, used if aspect_info==FF_ASPECT_EXTENDED
-     * encoding: set by user.
-     * decoding: set by lavc.
+     * Obsolete, will be removed
      */
     int aspected_width;
     int aspected_height;
@@ -795,6 +793,13 @@
 #define FF_PRED_LEFT   0
 #define FF_PRED_PLANE  1
 #define FF_PRED_MEDIAN 2
+    
+    /**
+     * aspect ratio. (0 if unknown)
+     * encoding: set by user.
+     * decoding: set by lavc.
+     */
+    float aspect_ratio;
 } AVCodecContext;
 
 typedef struct AVCodec {