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/mpegvideo.c | |
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/mpegvideo.c')
-rw-r--r-- | libavcodec/mpegvideo.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index d7474084f1..2f60055721 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -302,6 +302,7 @@ static int alloc_picture(MpegEncContext *s, Picture *pic, int shared){ } } pic->qstride= s->mb_stride; + CHECKED_ALLOCZ(pic->pan_scan , 1 * sizeof(AVPanScan)) } //it might be nicer if the application would keep track of these but it would require a API change @@ -332,6 +333,7 @@ static void free_picture(MpegEncContext *s, Picture *pic){ av_freep(&pic->mbskip_table); av_freep(&pic->qscale_table); av_freep(&pic->mb_type_base); + av_freep(&pic->pan_scan); pic->mb_type= NULL; for(i=0; i<2; i++){ av_freep(&pic->motion_val[i]); |