---
libavcodec/mpeg4video.h | 1 +
libavcodec/mpeg4videodec.c | 6 +++---
libavcodec/mpegvideo.h | 1 -
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h
index 2dbc213..6b758bb 100644
--- a/libavcodec/mpeg4video.h
+++ b/libavcodec/mpeg4video.h
@@ -74,6 +74,7 @@ typedef struct Mpeg4DecContext {
int t_frame;
int reduced_res_vop;
+ int new_pred;
/* bug workarounds */
int divx_version;
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index b7e5d8c..1d92474 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -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 */
@@ -1951,7 +1951,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;
ctx->reduced_res_vop = 0;
}
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 3d4e26d..8dbded9 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -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
--
1.7.10.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
