aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-02-28 20:58:31 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-28 22:53:12 +0100
commite8565d21c276ab9ac5ce785549420321fbd0b093 (patch)
treeb32d36e8bcd12f4f20febfe9319af6c9a15ea544
parent732c3ebffaff5005367d7f947fa903f3b6e92f68 (diff)
downloadffmpeg-e8565d21c276ab9ac5ce785549420321fbd0b093.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>
-rw-r--r--libavformat/flvenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 7d3a0ca99f..e19374fd79 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -537,7 +537,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));