Commit d8ad14b9 authored by andoma's avatar andoma

Only warn about "Invalid and inefficient vfw-avi packed B frames" once.

Patch by Andrew Savchenko, Bircoph at list dot ru



git-svn-id: file:///var/local/repositories/ffmpeg/trunk@15772 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent d116d503
...@@ -5751,8 +5751,10 @@ static int decode_user_data(MpegEncContext *s, GetBitContext *gb){ ...@@ -5751,8 +5751,10 @@ static int decode_user_data(MpegEncContext *s, GetBitContext *gb){
s->divx_version= ver; s->divx_version= ver;
s->divx_build= build; s->divx_build= build;
s->divx_packed= e==3 && last=='p'; s->divx_packed= e==3 && last=='p';
if(s->divx_packed) if(s->divx_packed && !s->showed_packed_warning) {
av_log(s->avctx, AV_LOG_WARNING, "Invalid and inefficient vfw-avi packed B frames detected\n"); av_log(s->avctx, AV_LOG_WARNING, "Invalid and inefficient vfw-avi packed B frames detected\n");
s->showed_packed_warning=1;
}
} }
/* ffmpeg detection */ /* ffmpeg detection */
......
...@@ -487,6 +487,7 @@ typedef struct MpegEncContext { ...@@ -487,6 +487,7 @@ 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
/* H.263+ specific */ /* H.263+ specific */
int umvplus; ///< == H263+ && unrestricted_mv int umvplus; ///< == H263+ && unrestricted_mv
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment