RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext

This commit is contained in:
Anton Khirnov 2013-11-29 22:26:15 +01:00
parent f7d228676c
commit ff7ffe4809
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mpeg4video.h
View File

@ -92,6 +92,8 @@ typedef struct Mpeg4DecContext {
int divx_build; int divx_build;
int xvid_build; int xvid_build;
int lavc_build; int lavc_build;
///< flag for having shown the warning about divxs invalid b frames
int showed_packed_warning;
int cplx_estimation_trash_i; int cplx_estimation_trash_i;
int cplx_estimation_trash_p; int cplx_estimation_trash_p;

4
libavcodec/mpeg4videodec.c
View File

@ -2016,10 +2016,10 @@ static int decode_user_data(Mpeg4DecContext *ctx, GetBitContext *gb)
ctx->divx_version = ver; ctx->divx_version = ver;
ctx->divx_build = build; ctx->divx_build = build;
s->divx_packed = e == 3 && last == 'p'; s->divx_packed = e == 3 && last == 'p';
if (s->divx_packed && !s->showed_packed_warning) { if (s->divx_packed && !ctx->showed_packed_warning) {
av_log(s->avctx, AV_LOG_WARNING, av_log(s->avctx, AV_LOG_WARNING,
"Invalid and inefficient vfw-avi packed B frames detected\n"); "Invalid and inefficient vfw-avi packed B frames detected\n");
s->showed_packed_warning = 1; ctx->showed_packed_warning = 1;
} }
} }

1
libavcodec/mpegvideo.h
View File

@ -553,7 +553,6 @@ typedef struct MpegEncContext {
/* H.263 specific */ /* H.263 specific */
int gob_index; int gob_index;
int obmc; ///< overlapped block motion compensation int obmc; ///< overlapped block motion compensation
int showed_packed_warning; ///< flag for having shown the warning about divxs invalid b frames
int mb_info; ///< interval for outputting info about mb offsets as side data int mb_info; ///< interval for outputting info about mb offsets as side data
int prev_mb_info, last_mb_info; int prev_mb_info, last_mb_info;
uint8_t *mb_info_ptr; uint8_t *mb_info_ptr;