virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContext

Browse Source
This commit is contained in:
Anton Khirnov 2013-11-26 14:34:52 +01:00
parent e89247debd
commit 3b1c0f686d
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mpeg4video.h
View File

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

6
libavcodec/mpeg4videodec.c
View File

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

1
libavcodec/mpegvideo.h
View File

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