highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mux: fix "no tag found" check in validate_codec_tag()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-01 22:29:06 +01:00
parent 06bb1de1c7
commit e9a26dc5bf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/mux.c
View File

@ -189,7 +189,7 @@ static int validate_codec_tag(AVFormatContext *s, AVStream *st)
const AVCodecTag *avctag; const AVCodecTag *avctag;
int n; int n;
enum AVCodecID id = AV_CODEC_ID_NONE; enum AVCodecID id = AV_CODEC_ID_NONE;
unsigned int tag = 0; int64_t tag = -1;
/** /**
* Check that tag + id is in the table * Check that tag + id is in the table
@ -212,7 +212,7 @@ static int validate_codec_tag(AVFormatContext *s, AVStream *st)
} }
if (id != AV_CODEC_ID_NONE) if (id != AV_CODEC_ID_NONE)
return 0; return 0;
if (tag && (st->codec->strict_std_compliance >= FF_COMPLIANCE_NORMAL)) if (tag >= 0 && (st->codec->strict_std_compliance >= FF_COMPLIANCE_NORMAL))
return 0; return 0;
return 1; return 1;
} }