Merge commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2'
* commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2': Add av_image_check_sar() and use it to validate SAR Conflicts: libavcodec/dpx.c libavcodec/dvdec.c libavcodec/ffv1dec.c libavcodec/utils.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@@ -1347,6 +1347,8 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
|
||||
}
|
||||
} // MPEG-2
|
||||
|
||||
ff_set_sar(s->avctx, s->avctx->sample_aspect_ratio);
|
||||
|
||||
avctx->pix_fmt = mpeg_get_pixelformat(avctx);
|
||||
setup_hwaccel_for_pixfmt(avctx);
|
||||
|
||||
|
Reference in New Issue
Block a user