eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-05 21:55:37 +01:00
Code Issues Packages Projects Releases Wiki 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
Download Patch File Download Diff File Expand all files Collapse all files

6
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);