November 2017 - ffmpeg-cvslog

lavc: enable hwaccel_flags option
by Jun Zhao 16 Dec '17

16 Dec '17

ffmpeg | branch: master | Jun Zhao <mypopydev(a)gmail.com> | Mon Oct 9 15:49:58 2017 +0800| [71e2ec017a1b51987d50b97d48b6a6114a58507d] | committer: Mark Thompson lavc: enable hwaccel_flags option Enable per-stream hwaccel_flags. Signed-off-by: Jun Zhao <jun.zhao(a)intel.com> Signed-off-by: Mark Thompson <sw(a)jkqxz.net> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=71e2ec017a1b51987… --- libavcodec/options_table.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 12712fb541..2ac37c3ff1 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -576,6 +576,10 @@ static const AVOption avcodec_options[] = { {"pixel_format", "set pixel format", OFFSET(pix_fmt), AV_OPT_TYPE_PIXEL_FMT, {.i64=AV_PIX_FMT_NONE}, -1, INT_MAX, 0 }, {"video_size", "set video size", OFFSET(width), AV_OPT_TYPE_IMAGE_SIZE, {.str=NULL}, 0, INT_MAX, 0 }, {"max_pixels", "Maximum number of pixels", OFFSET(max_pixels), AV_OPT_TYPE_INT64, {.i64 = INT_MAX }, 0, INT_MAX, A|V|S|D|E }, +{"hwaccel_flags", NULL, OFFSET(hwaccel_flags), AV_OPT_TYPE_FLAGS, {.i64 = AV_HWACCEL_FLAG_IGNORE_LEVEL }, 0, UINT_MAX, V|D, "hwaccel_flags"}, +{"ignore_level", "ignore level even if the codec level used is unknown or higher than the maximum supported level reported by the hardware driver", 0, AV_OPT_TYPE_CONST, { .i64 = AV_HWACCEL_FLAG_IGNORE_LEVEL }, INT_MIN, INT_MAX, V | D, "hwaccel_flags" }, +{"allow_high_depth", "allow to output YUV pixel formats with a different chroma sampling than 4:2:0 and/or other than 8 bits per component", 0, AV_OPT_TYPE_CONST, {.i64 = AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH }, INT_MIN, INT_MAX, V | D, "hwaccel_flags"}, +{"allow_profile_mismatch", "attempt to decode anyway if HW accelerated decoder's supported profiles do not exactly match the stream", 0, AV_OPT_TYPE_CONST, {.i64 = AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH }, INT_MIN, INT_MAX, V | D, "hwaccel_flags"}, {NULL}, };

2 1

configure: Fix dependencies of aac_at decoder.
by Jacob Trimble 30 Nov '17

30 Nov '17

ffmpeg | branch: master | Jacob Trimble <modmaker(a)google.com> | Thu Nov 30 14:58:59 2017 -0800| [83ecdc9a920d7f0b69d1a25d63757adb887a1f25] | committer: James Almer configure: Fix dependencies of aac_at decoder. Signed-off-by: Jacob Trimble <modmaker(a)google.com> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=83ecdc9a920d7f0b6… --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 1fa16e9dba..d05388638d 100755 --- a/configure +++ b/configure @@ -2890,6 +2890,7 @@ trace_headers_bsf_select="cbs_h264 cbs_h265 cbs_mpeg2" # external libraries aac_at_decoder_deps="audiotoolbox" +aac_at_decoder_select="aac_adtstoasc_bsf" ac3_at_decoder_deps="audiotoolbox" ac3_at_decoder_select="ac3_parser" adpcm_ima_qt_at_decoder_deps="audiotoolbox"

1 0

lavf/mov: fix huge alloc in mov_read_ctts
by John Stebbins 30 Nov '17

30 Nov '17

ffmpeg | branch: master | John Stebbins <jstebbins(a)jetheaddev.com> | Sun Nov 26 07:32:30 2017 -0800| [2d015d3bf9fed59c65a3819a35fedbb8b7dde623] | committer: Michael Niedermayer lavf/mov: fix huge alloc in mov_read_ctts An invalid file may cause huge alloc. Delay expansion of ctts entries until the number of samples is known in mov_build_index. Fixes: 23 Found-by: zhao dongzhuo, AD-lab of Venustech Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d015d3bf9fed59c6… --- libavformat/mov.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index c9018592e0..f7fab98dd8 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2895,7 +2895,7 @@ static int mov_read_ctts(MOVContext *c, AVIOContext *pb, MOVAtom atom) { AVStream *st; MOVStreamContext *sc; - unsigned int i, j, entries, ctts_count = 0; + unsigned int i, entries, ctts_count = 0; if (c->fc->nb_streams < 1) return 0; @@ -2928,9 +2928,8 @@ static int mov_read_ctts(MOVContext *c, AVIOContext *pb, MOVAtom atom) continue; } - /* Expand entries such that we have a 1-1 mapping with samples. */ - for (j = 0; j < count; j++) - add_ctts_entry(&sc->ctts_data, &ctts_count, &sc->ctts_allocated_size, 1, duration); + add_ctts_entry(&sc->ctts_data, &ctts_count, &sc->ctts_allocated_size, + count, duration); av_log(c->fc, AV_LOG_TRACE, "count=%d, duration=%d\n", count, duration); @@ -3579,6 +3578,8 @@ static void mov_build_index(MOVContext *mov, AVStream *st) unsigned int stps_index = 0; unsigned int i, j; uint64_t stream_size = 0; + MOVStts *ctts_data_old = sc->ctts_data; + unsigned int ctts_count_old = sc->ctts_count; if (sc->elst_count) { int i, edit_start_index = 0, multiple_edits = 0; @@ -3647,6 +3648,28 @@ static void mov_build_index(MOVContext *mov, AVStream *st) } st->index_entries_allocated_size = (st->nb_index_entries + sc->sample_count) * sizeof(*st->index_entries); + if (ctts_data_old) { + // Expand ctts entries such that we have a 1-1 mapping with samples + if (sc->sample_count >= UINT_MAX / sizeof(*sc->ctts_data)) + return; + sc->ctts_count = 0; + sc->ctts_allocated_size = 0; + sc->ctts_data = av_fast_realloc(NULL, &sc->ctts_allocated_size, + sc->sample_count * sizeof(*sc->ctts_data)); + if (!sc->ctts_data) { + av_free(ctts_data_old); + return; + } + for (i = 0; i < ctts_count_old && + sc->ctts_count < sc->sample_count; i++) + for (j = 0; j < ctts_data_old[i].count && + sc->ctts_count < sc->sample_count; j++) + add_ctts_entry(&sc->ctts_data, &sc->ctts_count, + &sc->ctts_allocated_size, 1, + ctts_data_old[i].duration); + av_free(ctts_data_old); + } + for (i = 0; i < sc->chunk_count; i++) { int64_t next_offset = i+1 < sc->chunk_count ? sc->chunk_offsets[i+1] : INT64_MAX; current_offset = sc->chunk_offsets[i];

1 0

lavfi/libvmaf: Rename local variable "main" as "master".
by Carl Eugen Hoyos 30 Nov '17

30 Nov '17

ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg(a)gmail.com> | Thu Nov 30 14:13:15 2017 +0100| [d13b8f68d7cb1e03259faf2da54ff1a5da2b54e1] | committer: Carl Eugen Hoyos lavfi/libvmaf: Rename local variable "main" as "master". Fixes the following warning: libavfilter/vf_libvmaf.c:179:14: warning: 'main' is usually a function Missed in 5d3e9357 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d13b8f68d7cb1e032… --- libavfilter/vf_libvmaf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c index 7670c51e21..e83b89b4f1 100644 --- a/libavfilter/vf_libvmaf.c +++ b/libavfilter/vf_libvmaf.c @@ -176,14 +176,14 @@ static int do_vmaf(FFFrameSync *fs) { AVFilterContext *ctx = fs->parent; LIBVMAFContext *s = ctx->priv; - AVFrame *main, *ref; + AVFrame *master, *ref; int ret; - ret = ff_framesync_dualinput_get(fs, &main, &ref); + ret = ff_framesync_dualinput_get(fs, &master, &ref); if (ret < 0) return ret; if (!ref) - return ff_filter_frame(ctx->outputs[0], main); + return ff_filter_frame(ctx->outputs[0], master); pthread_mutex_lock(&s->lock); @@ -192,14 +192,14 @@ static int do_vmaf(FFFrameSync *fs) } av_frame_ref(s->gref, ref); - av_frame_ref(s->gmain, main); + av_frame_ref(s->gmain, master); s->frame_set = 1; pthread_cond_signal(&s->cond); pthread_mutex_unlock(&s->lock); - return ff_filter_frame(ctx->outputs[0], main); + return ff_filter_frame(ctx->outputs[0], master); } static av_cold int init(AVFilterContext *ctx)

1 0

configure: select vp9_superframe_split_bsf when enabling vp9_decoder
by James Almer 30 Nov '17

30 Nov '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Thu Nov 30 01:51:16 2017 -0300| [5a366f9770dd7b02b0721b2857d6baa96acdb0af] | committer: James Almer configure: select vp9_superframe_split_bsf when enabling vp9_decoder This is required since a5679933c1b8b6bef5c5c3eb7c70d06c695066cf Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a366f9770dd7b02b… --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 4e7254eaeb..1fa16e9dba 100755 --- a/configure +++ b/configure @@ -2637,7 +2637,7 @@ vp6a_decoder_select="vp6_decoder" vp6f_decoder_select="vp6_decoder" vp7_decoder_select="h264pred videodsp vp8dsp" vp8_decoder_select="h264pred videodsp vp8dsp" -vp9_decoder_select="videodsp vp9_parser" +vp9_decoder_select="videodsp vp9_parser vp9_superframe_split_bsf" webp_decoder_select="vp8_decoder exif" wmalossless_decoder_select="llauddsp" wmapro_decoder_select="mdct sinewin wma_freqs"

1 0

avformat/avc: support writting more than one sps/pps in ff_isom_write_avcc
by James Almer 30 Nov '17

30 Nov '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Nov 24 22:36:22 2017 -0300| [8d33e8661694f45a4552d3a3eff736a0f0d17932] | committer: James Almer avformat/avc: support writting more than one sps/pps in ff_isom_write_avcc Addresses ticket #6864 Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d33e8661694f45a4… --- libavformat/avc.c | 51 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/libavformat/avc.c b/libavformat/avc.c index d989594bb0..ec50033a04 100644 --- a/libavformat/avc.c +++ b/libavformat/avc.c @@ -20,6 +20,7 @@ */ #include "libavutil/intreadwrite.h" +#include "libavcodec/h264.h" #include "avformat.h" #include "avio.h" #include "avc.h" @@ -105,10 +106,11 @@ int ff_avc_parse_nal_units_buf(const uint8_t *buf_in, uint8_t **buf, int *size) int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) { + AVIOContext *sps_pb = NULL, *pps_pb = NULL; uint8_t *buf = NULL, *end, *start = NULL; uint8_t *sps = NULL, *pps = NULL; uint32_t sps_size = 0, pps_size = 0; - int ret; + int ret, nb_sps = 0, nb_pps = 0; if (len <= 6) return AVERROR_INVALIDDATA; @@ -126,6 +128,13 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) start = buf; end = buf + len; + ret = avio_open_dyn_buf(&sps_pb); + if (ret < 0) + goto fail; + ret = avio_open_dyn_buf(&pps_pb); + if (ret < 0) + goto fail; + /* look for sps and pps */ while (end - buf > 4) { uint32_t size; @@ -135,35 +144,51 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) nal_type = buf[0] & 0x1f; if (nal_type == 7) { /* SPS */ - sps = buf; - sps_size = size; + nb_sps++; + if (size > UINT16_MAX || nb_sps >= H264_MAX_SPS_COUNT) { + ret = AVERROR_INVALIDDATA; + goto fail; + } + avio_wb16(sps_pb, size); + avio_write(sps_pb, buf, size); } else if (nal_type == 8) { /* PPS */ - pps = buf; - pps_size = size; + nb_pps++; + if (size > UINT16_MAX || nb_pps >= H264_MAX_PPS_COUNT) { + ret = AVERROR_INVALIDDATA; + goto fail; + } + avio_wb16(pps_pb, size); + avio_write(pps_pb, buf, size); } buf += size; } + sps_size = avio_close_dyn_buf(sps_pb, &sps); + pps_size = avio_close_dyn_buf(pps_pb, &pps); - if (!sps || !pps || sps_size < 4 || sps_size > UINT16_MAX || pps_size > UINT16_MAX) { + if (sps_size < 6 || !pps_size) { ret = AVERROR_INVALIDDATA; goto fail; } avio_w8(pb, 1); /* version */ - avio_w8(pb, sps[1]); /* profile */ - avio_w8(pb, sps[2]); /* profile compat */ - avio_w8(pb, sps[3]); /* level */ + avio_w8(pb, sps[3]); /* profile */ + avio_w8(pb, sps[4]); /* profile compat */ + avio_w8(pb, sps[5]); /* level */ avio_w8(pb, 0xff); /* 6 bits reserved (111111) + 2 bits nal size length - 1 (11) */ - avio_w8(pb, 0xe1); /* 3 bits reserved (111) + 5 bits number of sps (00001) */ + avio_w8(pb, 0xe0 | nb_sps); /* 3 bits reserved (111) + 5 bits number of sps */ - avio_wb16(pb, sps_size); avio_write(pb, sps, sps_size); - avio_w8(pb, 1); /* number of pps */ - avio_wb16(pb, pps_size); + avio_w8(pb, nb_pps); /* number of pps */ avio_write(pb, pps, pps_size); fail: + if (!sps) + avio_close_dyn_buf(sps_pb, &sps); + if (!pps) + avio_close_dyn_buf(pps_pb, &pps); + av_free(sps); + av_free(pps); av_free(start); return ret;

1 0

avformat/avc: free buffer in ff_isom_write_avcc on failure
by James Almer 30 Nov '17

30 Nov '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Nov 24 20:26:08 2017 -0300| [d5af8afbe4698273b2ef9b57487489b40f7888b1] | committer: James Almer avformat/avc: free buffer in ff_isom_write_avcc on failure Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5af8afbe4698273b… --- libavformat/avc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavformat/avc.c b/libavformat/avc.c index 85441df8f7..d989594bb0 100644 --- a/libavformat/avc.c +++ b/libavformat/avc.c @@ -145,8 +145,10 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) buf += size; } - if (!sps || !pps || sps_size < 4 || sps_size > UINT16_MAX || pps_size > UINT16_MAX) - return AVERROR_INVALIDDATA; + if (!sps || !pps || sps_size < 4 || sps_size > UINT16_MAX || pps_size > UINT16_MAX) { + ret = AVERROR_INVALIDDATA; + goto fail; + } avio_w8(pb, 1); /* version */ avio_w8(pb, sps[1]); /* profile */ @@ -160,9 +162,11 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) avio_w8(pb, 1); /* number of pps */ avio_wb16(pb, pps_size); avio_write(pb, pps, pps_size); + +fail: av_free(start); - return 0; + return ret; } int ff_avc_write_annexb_extradata(const uint8_t *in, uint8_t **buf, int *size)

1 0

avformat/avc: reindent after the last commit
by James Almer 30 Nov '17

30 Nov '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Nov 24 19:47:47 2017 -0300| [df20619b649e82598d0e6efab291b427922b8ca4] | committer: James Almer avformat/avc: reindent after the last commit Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df20619b649e82598… --- libavformat/avc.c | 91 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/libavformat/avc.c b/libavformat/avc.c index a764ec0422..85441df8f7 100644 --- a/libavformat/avc.c +++ b/libavformat/avc.c @@ -113,54 +113,55 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) if (len <= 6) return AVERROR_INVALIDDATA; - /* check for H.264 start code */ - if (AV_RB32(data) != 0x00000001 && - AV_RB24(data) != 0x000001) { - avio_write(pb, data, len); - return 0; + /* check for H.264 start code */ + if (AV_RB32(data) != 0x00000001 && + AV_RB24(data) != 0x000001) { + avio_write(pb, data, len); + return 0; + } + + ret = ff_avc_parse_nal_units_buf(data, &buf, &len); + if (ret < 0) + return ret; + start = buf; + end = buf + len; + + /* look for sps and pps */ + while (end - buf > 4) { + uint32_t size; + uint8_t nal_type; + size = FFMIN(AV_RB32(buf), end - buf - 4); + buf += 4; + nal_type = buf[0] & 0x1f; + + if (nal_type == 7) { /* SPS */ + sps = buf; + sps_size = size; + } else if (nal_type == 8) { /* PPS */ + pps = buf; + pps_size = size; } - ret = ff_avc_parse_nal_units_buf(data, &buf, &len); - if (ret < 0) - return ret; - start = buf; - end = buf + len; - - /* look for sps and pps */ - while (end - buf > 4) { - uint32_t size; - uint8_t nal_type; - size = FFMIN(AV_RB32(buf), end - buf - 4); - buf += 4; - nal_type = buf[0] & 0x1f; - - if (nal_type == 7) { /* SPS */ - sps = buf; - sps_size = size; - } else if (nal_type == 8) { /* PPS */ - pps = buf; - pps_size = size; - } - - buf += size; - } + buf += size; + } + + if (!sps || !pps || sps_size < 4 || sps_size > UINT16_MAX || pps_size > UINT16_MAX) + return AVERROR_INVALIDDATA; + + avio_w8(pb, 1); /* version */ + avio_w8(pb, sps[1]); /* profile */ + avio_w8(pb, sps[2]); /* profile compat */ + avio_w8(pb, sps[3]); /* level */ + avio_w8(pb, 0xff); /* 6 bits reserved (111111) + 2 bits nal size length - 1 (11) */ + avio_w8(pb, 0xe1); /* 3 bits reserved (111) + 5 bits number of sps (00001) */ + + avio_wb16(pb, sps_size); + avio_write(pb, sps, sps_size); + avio_w8(pb, 1); /* number of pps */ + avio_wb16(pb, pps_size); + avio_write(pb, pps, pps_size); + av_free(start); - if (!sps || !pps || sps_size < 4 || sps_size > UINT16_MAX || pps_size > UINT16_MAX) - return AVERROR_INVALIDDATA; - - avio_w8(pb, 1); /* version */ - avio_w8(pb, sps[1]); /* profile */ - avio_w8(pb, sps[2]); /* profile compat */ - avio_w8(pb, sps[3]); /* level */ - avio_w8(pb, 0xff); /* 6 bits reserved (111111) + 2 bits nal size length - 1 (11) */ - avio_w8(pb, 0xe1); /* 3 bits reserved (111) + 5 bits number of sps (00001) */ - - avio_wb16(pb, sps_size); - avio_write(pb, sps, sps_size); - avio_w8(pb, 1); /* number of pps */ - avio_wb16(pb, pps_size); - avio_write(pb, pps, pps_size); - av_free(start); return 0; }

1 0

avformat/avc: refactor ff_isom_write_avcc
by James Almer 30 Nov '17

30 Nov '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Nov 24 19:45:54 2017 -0300| [9cd361c5c1f3550df9b2d4bd13b02ea592727f7c] | committer: James Almer avformat/avc: refactor ff_isom_write_avcc This lets us remove one indentation level. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9cd361c5c1f3550df… --- libavformat/avc.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/libavformat/avc.c b/libavformat/avc.c index 5232ed55f8..a764ec0422 100644 --- a/libavformat/avc.c +++ b/libavformat/avc.c @@ -105,17 +105,22 @@ int ff_avc_parse_nal_units_buf(const uint8_t *buf_in, uint8_t **buf, int *size) int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) { + uint8_t *buf = NULL, *end, *start = NULL; + uint8_t *sps = NULL, *pps = NULL; + uint32_t sps_size = 0, pps_size = 0; + int ret; + if (len <= 6) return AVERROR_INVALIDDATA; /* check for H.264 start code */ - if (AV_RB32(data) == 0x00000001 || - AV_RB24(data) == 0x000001) { - uint8_t *buf=NULL, *end, *start; - uint32_t sps_size=0, pps_size=0; - uint8_t *sps=0, *pps=0; + if (AV_RB32(data) != 0x00000001 && + AV_RB24(data) != 0x000001) { + avio_write(pb, data, len); + return 0; + } - int ret = ff_avc_parse_nal_units_buf(data, &buf, &len); + ret = ff_avc_parse_nal_units_buf(data, &buf, &len); if (ret < 0) return ret; start = buf; @@ -156,9 +161,6 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) avio_wb16(pb, pps_size); avio_write(pb, pps, pps_size); av_free(start); - } else { - avio_write(pb, data, len); - } return 0; }

1 0

avformat/avc: return an error in ff_isom_write_avcc if the buffer lenght is too small
by James Almer 30 Nov '17

30 Nov '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Nov 24 19:42:50 2017 -0300| [ae7df68edd79bce5c318810c6b307ee4e81cd2a6] | committer: James Almer avformat/avc: return an error in ff_isom_write_avcc if the buffer lenght is too small Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae7df68edd79bce5c… --- libavformat/avc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/avc.c b/libavformat/avc.c index 094a95821f..5232ed55f8 100644 --- a/libavformat/avc.c +++ b/libavformat/avc.c @@ -105,7 +105,9 @@ int ff_avc_parse_nal_units_buf(const uint8_t *buf_in, uint8_t **buf, int *size) int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) { - if (len > 6) { + if (len <= 6) + return AVERROR_INVALIDDATA; + /* check for H.264 start code */ if (AV_RB32(data) == 0x00000001 || AV_RB24(data) == 0x000001) { @@ -157,7 +159,6 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) } else { avio_write(pb, data, len); } - } return 0; }

1 0