diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 21:39:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 21:46:11 +0100 |
| commit | ca4dd3810e20028d100e39bc42ebc39712c70573 (patch) | |
| tree | d5ab0f2f45b390a51bb4d43852e59bde868734f0 /libavcodec/h264.c | |
| parent | af0fafcb6f086e4e0f087866b5de71c428049555 (diff) | |
| download | ffmpeg-ca4dd3810e20028d100e39bc42ebc39712c70573.tar.gz | |
h264: use must_reinit to simplify code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 63a4c76ac3..de7a5ac997 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2781,11 +2781,9 @@ static int decode_slice_header(H264Context *h, H264Context *h0) s->avctx->pix_fmt = pix_fmt; if (s->context_initialized && - (s->width != s->avctx->coded_width || - s->height != s->avctx->coded_height || - pix_fmt != s->avctx->pix_fmt || + ( needs_reinit || - av_cmp_q(h->sps.sar, s->avctx->sample_aspect_ratio))) { + must_reinit)) { if (h != h0) { av_log(s->avctx, AV_LOG_ERROR, "changing width/height on " |