Browse Source

h264: use must_reinit to simplify code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.1
Michael Niedermayer 13 years ago
parent
commit
ca4dd3810e
1 changed files with 2 additions and 4 deletions
  1. +2
    -4
      libavcodec/h264.c

+ 2
- 4
libavcodec/h264.c View File

@@ -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 "


Loading…
Cancel
Save