[FFmpeg-cvslog] mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable
Anton Khirnov
git at videolan.org
Sat Nov 30 03:55:20 CET 2013
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Nov 26 14:34:52 2013 +0100| [e89247debd5276d57ce4a26516224204f9541af0] | committer: Anton Khirnov
mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e89247debd5276d57ce4a26516224204f9541af0
---
libavcodec/mpeg4videodec.c | 4 +---
libavcodec/mpegvideo.h | 1 -
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 0b22974..e2ad794 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -1946,13 +1946,11 @@ no_cplx_est:
skip_bits(gb, 2); /* requested upstream message type */
skip_bits1(gb); /* newpred segment type */
}
- s->reduced_res_vop = get_bits1(gb);
- if (s->reduced_res_vop)
+ if (get_bits1(gb)) // reduced_res_vop
av_log(s->avctx, AV_LOG_ERROR,
"reduced resolution VOP not supported\n");
} else {
s->new_pred = 0;
- s->reduced_res_vop = 0;
}
s->scalability = get_bits1(gb);
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 8250211..3d4e26d 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -593,7 +593,6 @@ typedef struct MpegEncContext {
int hierachy_type;
int enhancement_type;
int new_pred;
- int reduced_res_vop;
int aspect_ratio_info; //FIXME remove
int sprite_warping_accuracy;
int data_partitioning; ///< data partitioning flag from header
More information about the ffmpeg-cvslog
mailing list