Commit ca4dd381 authored by Michael Niedermayer's avatar Michael Niedermayer

h264: use must_reinit to simplify code

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent af0fafcb
...@@ -2781,11 +2781,9 @@ static int decode_slice_header(H264Context *h, H264Context *h0) ...@@ -2781,11 +2781,9 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
s->avctx->pix_fmt = pix_fmt; s->avctx->pix_fmt = pix_fmt;
if (s->context_initialized && if (s->context_initialized &&
(s->width != s->avctx->coded_width || (
s->height != s->avctx->coded_height ||
pix_fmt != s->avctx->pix_fmt ||
needs_reinit || needs_reinit ||
av_cmp_q(h->sps.sar, s->avctx->sample_aspect_ratio))) { must_reinit)) {
if (h != h0) { if (h != h0) {
av_log(s->avctx, AV_LOG_ERROR, "changing width/height on " av_log(s->avctx, AV_LOG_ERROR, "changing width/height on "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment