diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-02-28 20:58:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-28 23:00:55 +0100 |
| commit | 86c024ea9e65f9c4c0b01f02712f4fd7313371e7 (patch) | |
| tree | 63d10f2d340f3a03ab0556e6c6499feca26afb78 | |
| parent | 0b0a8cd133c711e6d74a57a3fa1d8eaa28b74ce8 (diff) | |
| download | ffmpeg-86c024ea9e65f9c4c0b01f02712f4fd7313371e7.tar.gz | |
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 e8565d21c276ab9ac5ce785549420321fbd0b093)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/flvenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 95905a15e0..31f23712ce 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -484,7 +484,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) avio_w8(pb, FLV_TAG_TYPE_VIDEO); flags = enc->codec_tag; - if (flags == 0) { + if (flags <= 0 || flags > 15) { av_log(s, AV_LOG_ERROR, "Video codec '%s' is not compatible with FLV\n", avcodec_get_name(enc->codec_id)); |