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

avformat/flvenc: check that the codec_tag fits in the available bits 

flags is later written with avio_w8 and if it doesn't fit in one byte it
triggers an av_assert2.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e8565d21c2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Andreas Cadhalpun 2015-02-28 20:58:31 +01:00 committed by Michael Niedermayer
parent ddffbf720a
commit a80b38d7d2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/flvenc.c
View File

@ -489,7 +489,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
avio_w8(pb, FLV_TAG_TYPE_VIDEO); avio_w8(pb, FLV_TAG_TYPE_VIDEO);
flags = enc->codec_tag; flags = enc->codec_tag;
if (flags == 0) { if (flags <= 0 || flags > 15) {
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"Video codec '%s' is not compatible with FLV\n", "Video codec '%s' is not compatible with FLV\n",
avcodec_get_name(enc->codec_id)); avcodec_get_name(enc->codec_id));