Browse Source

mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContext

tags/n2.2-rc1
Anton Khirnov 11 years ago
parent
commit
3b1c0f686d
3 changed files with 5 additions and 4 deletions
  1. +2
    -0
      libavcodec/mpeg4video.h
  2. +3
    -3
      libavcodec/mpeg4videodec.c
  3. +0
    -1
      libavcodec/mpegvideo.h

+ 2
- 0
libavcodec/mpeg4video.h View File

@@ -73,6 +73,8 @@ typedef struct Mpeg4DecContext {
///< time distance of first I -> B, used for interlaced b frames
int t_frame;

int new_pred;

/* bug workarounds */
int divx_version;
int divx_build;


+ 3
- 3
libavcodec/mpeg4videodec.c View File

@@ -1940,8 +1940,8 @@ no_cplx_est:
ctx->rvlc = get_bits1(gb);

if (vo_ver_id != 1) {
s->new_pred = get_bits1(gb);
if (s->new_pred) {
ctx->new_pred = get_bits1(gb);
if (ctx->new_pred) {
av_log(s->avctx, AV_LOG_ERROR, "new pred not supported\n");
skip_bits(gb, 2); /* requested upstream message type */
skip_bits1(gb); /* newpred segment type */
@@ -1950,7 +1950,7 @@ no_cplx_est:
av_log(s->avctx, AV_LOG_ERROR,
"reduced resolution VOP not supported\n");
} else {
s->new_pred = 0;
ctx->new_pred = 0;
}

s->scalability = get_bits1(gb);


+ 0
- 1
libavcodec/mpegvideo.h View File

@@ -592,7 +592,6 @@ typedef struct MpegEncContext {
int scalability;
int hierachy_type;
int enhancement_type;
int new_pred;
int aspect_ratio_info; //FIXME remove
int sprite_warping_accuracy;
int data_partitioning; ///< data partitioning flag from header


Loading…
Cancel
Save