Merge commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 22:26:07 +0000 (23:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 22:27:30 +0000 (23:27 +0100)
* commit 'bc5abfb19e7ff00b859120561d6ffd622c7904fe':
  mpeg4videodec: move MpegEncContext.rvlc to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mpeg4video.h
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.h
libavcodec/vaapi_mpeg4.c

Simple merge
@@@ -2021,17 -1984,6 +2021,17 @@@ no_cplx_est
          }
      }
  
-                s->data_partitioning ? "partition " : "", s->rvlc ? "rvlc " : ""
 +    if (s->avctx->debug&FF_DEBUG_PICT_INFO) {
 +        av_log(s->avctx, AV_LOG_DEBUG, "tb %d/%d, tincrbits:%d, qp_prec:%d, ps:%d,  %s%s%s%s\n",
 +               s->avctx->time_base.num, s->avctx->time_base.den,
 +               ctx->time_increment_bits,
 +               s->quant_precision,
 +               s->progressive_sequence,
 +               s->scalability ? "scalability " :"" , s->quarter_sample ? "qpel " : "",
++               s->data_partitioning ? "partition " : "", ctx->rvlc ? "rvlc " : ""
 +        );
 +    }
 +
      return 0;
  }
  
Simple merge
Simple merge