diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-11-20 13:08:04 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-11-20 13:08:04 +0000 |
| commit | 5d3cea3a86a9b994591998fb05cacfc16ae4852d (patch) | |
| tree | f9611b77616e2f574eb57c531cafa62d916c58a4 /libavcodec/avcodec.h | |
| parent | 67d06418daaee0ec43418f5e9a6288fc12203f54 (diff) | |
| download | ffmpeg-5d3cea3a86a9b994591998fb05cacfc16ae4852d.tar.gz | |
aspect ratio cleanup
Originally committed as revision 1254 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f88184d504..b587298ce3 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -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 @@ static const int Motion_Est_QTab[] = { ME_ZERO, ME_PHODS, ME_LOG, #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 @@ typedef struct AVCodecContext { 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 @@ typedef struct AVCodecContext { 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 @@ typedef struct AVCodecContext { #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 { |