diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-10-20 09:52:02 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-10-20 09:52:02 +0000 |
| commit | fa384dcc8100ef973a702b9e5bc3236571c97750 (patch) | |
| tree | 7e539a0d0de64b32417eee38c9c319389ff9d0f7 /libavcodec/avcodec.h | |
| parent | f2fae326e3f2ef03aa1b1ba91153f82a7f2be5c8 (diff) | |
| download | ffmpeg-fa384dcc8100ef973a702b9e5bc3236571c97750.tar.gz | |
export mpeg2 active display area / pan scan
fix mpeg2 aspect_ratio for the rare case that active display area != AVCodecContext.width/height
decode sequence display extension & picture display extension
Originally committed as revision 2401 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 39 |
1 files changed, 38 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 271561c79f..542200f7a1 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -15,7 +15,7 @@ extern "C" { #define FFMPEG_VERSION_INT 0x000408 #define FFMPEG_VERSION "0.4.8" -#define LIBAVCODEC_BUILD 4684 +#define LIBAVCODEC_BUILD 4685 #define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT #define LIBAVCODEC_VERSION FFMPEG_VERSION @@ -271,6 +271,34 @@ static const __attribute__((unused)) int Motion_Est_QTab[] = #define CODEC_CAP_PARSE_ONLY 0x0004 #define CODEC_CAP_TRUNCATED 0x0008 +/** + * Pan Scan area. + * this specifies the area which should be displayed. Note there may be multiple such areas for one frame + */ +typedef struct AVPanScan{ + /** + * id. + * - encoding: set by user. + * - decoding: set by lavc + */ + int id; + + /** + * width and height in 1/16 pel + * - encoding: set by user. + * - decoding: set by lavc + */ + int width; + int height; + + /** + * position of the top left corner in 1/16 pel for up to 3 fields/frames. + * - encoding: set by user. + * - decoding: set by lavc + */ + int16_t position[3][2]; +}AVPanScan; + #define FF_COMMON_FRAME \ /**\ * pointer to the picture planes.\ @@ -413,6 +441,14 @@ static const __attribute__((unused)) int Motion_Est_QTab[] = * - decoding: set by lavc (default 0)\ */\ int bottom_field_first;\ + \ + /**\ + * Pan scan.\ + * - encoding: set by user\ + * - decoding: set by lavc\ + */\ + AVPanScan *pan_scan;\ + #define FF_QSCALE_TYPE_MPEG1 0 #define FF_QSCALE_TYPE_MPEG2 1 @@ -1303,6 +1339,7 @@ typedef struct AVCodecContext { * - decoding: unused */ int lmax; + } AVCodecContext; |