diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-03 16:17:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-03 20:21:01 +0100 |
| commit | 23acfcd9e57ecdfa2f638176d670ddb5436b4b90 (patch) | |
| tree | b07f98fb17f116f24078a0ba9d69ddf620aa17ad | |
| parent | a487378ef535d149cf2c8633c1f901d875d039ef (diff) | |
| download | ffmpeg-23acfcd9e57ecdfa2f638176d670ddb5436b4b90.tar.gz | |
h264: favor coded_width in resolution chnaged checks
Suggested-by: Joakim Plate <elupus@ecce.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index eb8b2f1245..1b8f390214 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2707,7 +2707,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ s->height= 16*s->mb_height - (2<<s->chroma_y_shift)*FFMIN(h->sps.crop_bottom, (16>>s->chroma_y_shift)-1); if (s->context_initialized - && ( s->width != s->avctx->width || s->height != s->avctx->height + && ( s->width != s->avctx->coded_width || s->height != s->avctx->coded_height || s->avctx->bits_per_raw_sample != h->sps.bit_depth_luma || h->cur_chroma_format_idc != h->sps.chroma_format_idc || av_cmp_q(h->sps.sar, s->avctx->sample_aspect_ratio))) { |