diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-02 03:18:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-02 03:22:51 +0100 |
| commit | 75cc57f73f9aee8721a101b3c6ef85312ea9e54c (patch) | |
| tree | 66ba28e6233e3f5e768ef0b4b635e834c431431f | |
| parent | 1010b36d8672d891e77aa713e07ff749e8b0797f (diff) | |
| download | ffmpeg-75cc57f73f9aee8721a101b3c6ef85312ea9e54c.tar.gz | |
avcodec/mpeg12dec: Check actual aspect ratio instead of aspect_ratio_info
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpeg12dec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 3f7b2c3fb4..f7e57f934d 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -59,7 +59,7 @@ typedef struct Mpeg1Context { uint8_t afd; int has_afd; int slice_count; - int save_aspect_info; + AVRational save_aspect; int save_width, save_height, save_progressive_seq; AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */ int sync; /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */ @@ -1322,7 +1322,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) avctx->coded_height != s->height || s1->save_width != s->width || s1->save_height != s->height || - s1->save_aspect_info != s->aspect_ratio_info || + av_cmp_q(s1->save_aspect, s->avctx->sample_aspect_ratio) || (s1->save_progressive_seq != s->progressive_sequence && FFALIGN(s->height, 16) != FFALIGN(s->height, 32)) || 0) { if (s1->mpeg_enc_ctx_allocated) { @@ -1343,7 +1343,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) (s->bit_rate != 0x3FFFF*400 || s->vbv_delay != 0xFFFF)) { avctx->bit_rate = s->bit_rate; } - s1->save_aspect_info = s->aspect_ratio_info; + s1->save_aspect = s->avctx->sample_aspect_ratio; s1->save_width = s->width; s1->save_height = s->height; s1->save_progressive_seq = s->progressive_sequence; |