November 2015 - ffmpeg-cvslog

lavf/mxfdec: Set width to actual coded_width for AVCI50.
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Sun Nov 29 21:08:38 2015 +0100| [ec494e6c836909e7478000d9316c945b51d4a25c] | committer: Carl Eugen Hoyos lavf/mxfdec: Set width to actual coded_width for AVCI50. Fixes ticket #5029. Reported and analyzed by videolan trac user HenkDemper in vlc ticket #15762. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec494e6c836909e74… --- libavformat/mxfdec.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 429f46a..6b1c654 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1145,6 +1145,15 @@ static const MXFCodecUL mxf_intra_only_picture_essence_coding_uls[] = { { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, AV_CODEC_ID_NONE }, }; +/* actual coded width for AVC-Intra to allow selecting correct SPS/PPS */ +static const MXFCodecUL mxf_intra_only_picture_coded_width[] = { + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x32,0x21,0x01 }, 16, 1440 }, + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x32,0x21,0x02 }, 16, 1440 }, + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x32,0x21,0x03 }, 16, 1440 }, + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x32,0x21,0x04 }, 16, 1440 }, + { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, 0 }, +}; + static const MXFCodecUL mxf_sound_essence_container_uls[] = { // sound essence container uls { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x06,0x01,0x00 }, 14, AV_CODEC_ID_PCM_S16LE }, /* BWF Frame wrapped */ @@ -2128,6 +2137,10 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) memcpy(st->codec->extradata, descriptor->extradata, descriptor->extradata_size); } } else if (st->codec->codec_id == AV_CODEC_ID_H264) { + int coded_width = mxf_get_codec_ul(mxf_intra_only_picture_coded_width, + &descriptor->essence_codec_ul)->id; + if (coded_width) + st->codec->width = coded_width; ret = ff_generate_avci_extradata(st); if (ret < 0) return ret;

1 0

avfilter/af_sidechaincompress: fix output gain for rms(default) detection
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Nov 29 19:15:43 2015 +0100| [337b6d3b365a5be352841b0f2b57bd63afe6bff0] | committer: Paul B Mahol avfilter/af_sidechaincompress: fix output gain for rms(default) detection Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=337b6d3b365a5be35… --- libavfilter/af_sidechaincompress.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c index 1dce1c0..3af49ad 100644 --- a/libavfilter/af_sidechaincompress.c +++ b/libavfilter/af_sidechaincompress.c @@ -50,6 +50,7 @@ typedef struct SidechainCompressContext { double knee_start; double knee_stop; double lin_knee_start; + double adj_knee_start; double compressed_knee_stop; int link; int detection; @@ -87,6 +88,7 @@ static av_cold int init(AVFilterContext *ctx) s->thres = log(s->threshold); s->lin_knee_start = s->threshold / sqrt(s->knee); + s->adj_knee_start = s->lin_knee_start * s->lin_knee_start; s->knee_start = log(s->lin_knee_start); s->knee_stop = log(s->threshold * sqrt(s->knee)); s->compressed_knee_stop = (s->knee_stop - s->thres) / s->ratio + s->thres; @@ -166,7 +168,7 @@ static void compressor(SidechainCompressContext *s, s->lin_slope += (abs_sample - s->lin_slope) * (abs_sample > s->lin_slope ? s->attack_coeff : s->release_coeff); - if (s->lin_slope > 0.0 && s->lin_slope > s->lin_knee_start) + if (s->lin_slope > 0.0 && s->lin_slope > (s->detection ? s->adj_knee_start : s->lin_knee_start)) gain = output_gain(s->lin_slope, s->ratio, s->thres, s->knee, s->knee_start, s->knee_stop, s->compressed_knee_stop, s->detection);

1 0

AAC encoder: make pe.min a local minimum
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Claudio Freire <klaussfreire(a)gmail.com> | Sun Nov 29 15:03:45 2015 -0300| [88e498a87eb255eca48c40fd5570a42372491f2f] | committer: Claudio Freire AAC encoder: make pe.min a local minimum As noted in a comment, pe.min in the reference encoder is centered around current pe. The bit reservoir algo needs pe.min to be a local minimum, because it can only account for local PE variations. If it's set to a global minimum as was being done, bit reservoir logic doesn't work as efficiently. This patch tries to forget old minimums and converge to a local minimum without losing the stability of the previous solution. Listening tests until now suggest this solves numerous RC issues. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=88e498a87eb255eca… --- libavcodec/aacpsy.c | 13 ++++++++++--- tests/fate/aac.mak | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index 242df68..40b3b41 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -80,6 +80,8 @@ #define PSY_3GPP_AH_THR_LONG 0.5f #define PSY_3GPP_AH_THR_SHORT 0.63f +#define PSY_PE_FORGET_SLOPE 511 + enum { PSY_3GPP_AH_NONE, PSY_3GPP_AH_INACTIVE, @@ -495,7 +497,7 @@ static int calc_bit_demand(AacPsyContext *ctx, float pe, int bits, int size, const float bitspend_add = short_window ? PSY_3GPP_SPEND_ADD_S : PSY_3GPP_SPEND_ADD_L; const float clip_low = short_window ? PSY_3GPP_CLIP_LO_S : PSY_3GPP_CLIP_LO_L; const float clip_high = short_window ? PSY_3GPP_CLIP_HI_S : PSY_3GPP_CLIP_HI_L; - float clipped_pe, bit_save, bit_spend, bit_factor, fill_level; + float clipped_pe, bit_save, bit_spend, bit_factor, fill_level, forgetful_min_pe; ctx->fill_level += ctx->frame_bits - bits; ctx->fill_level = av_clip(ctx->fill_level, 0, size); @@ -512,9 +514,14 @@ static int calc_bit_demand(AacPsyContext *ctx, float pe, int bits, int size, * Hopefully below is correct. */ bit_factor = 1.0f - bit_save + ((bit_spend - bit_save) / (ctx->pe.max - ctx->pe.min)) * (clipped_pe - ctx->pe.min); - /* NOTE: The reference encoder attempts to center pe max/min around the current pe. */ + /* NOTE: The reference encoder attempts to center pe max/min around the current pe. + * Here we do that by slowly forgetting pe.min when pe stays in a range that makes + * it unlikely (ie: above the mean) + */ ctx->pe.max = FFMAX(pe, ctx->pe.max); - ctx->pe.min = FFMIN(pe, ctx->pe.min); + forgetful_min_pe = ((ctx->pe.min * PSY_PE_FORGET_SLOPE) + + FFMAX(ctx->pe.min, pe * (pe / ctx->pe.max))) / (PSY_PE_FORGET_SLOPE + 1); + ctx->pe.min = FFMIN(pe, forgetful_min_pe); /* NOTE: allocate a minimum of 1/8th average frame bits, to avoid * reservoir starvation from producing zero-bit frames diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index bc9541e..2d41888 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -146,7 +146,7 @@ fate-aac-aref-encode: CMD = enc_dec_pcm adts wav s16le $(REF) -strict -2 -c:a aa fate-aac-aref-encode: CMP = stddev fate-aac-aref-encode: REF = ./tests/data/asynth-44100-2.wav fate-aac-aref-encode: CMP_SHIFT = -4096 -fate-aac-aref-encode: CMP_TARGET = 1127 +fate-aac-aref-encode: CMP_TARGET = 1139 fate-aac-aref-encode: SIZE_TOLERANCE = 2464 fate-aac-aref-encode: FUZZ = 6 @@ -191,7 +191,7 @@ fate-aac-is-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-ref fate-aac-is-encode: CMP = stddev fate-aac-is-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav fate-aac-is-encode: CMP_SHIFT = -4096 -fate-aac-is-encode: CMP_TARGET = 582 +fate-aac-is-encode: CMP_TARGET = 584 fate-aac-is-encode: SIZE_TOLERANCE = 3560 fate-aac-is-encode: FUZZ = 1

1 0

ffserver: add NULL context to ff_rtsp_parse_line().
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Nicolas George <george(a)nsup.org> | Sun Nov 29 16:59:27 2015 +0100| [15206ffdbee3c04e638a01cd4572050cf4cfad42] | committer: Nicolas George ffserver: add NULL context to ff_rtsp_parse_line(). Needed after f62fe53/2c17fb6. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15206ffdbee3c04e6… --- ffserver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffserver.c b/ffserver.c index 7e4f620..65ae431 100644 --- a/ffserver.c +++ b/ffserver.c @@ -2837,7 +2837,7 @@ static int rtsp_parse_request(HTTPContext *c) len = sizeof(line) - 1; memcpy(line, p, len); line[len] = '\0'; - ff_rtsp_parse_line(header, line, NULL, NULL); + ff_rtsp_parse_line(NULL, header, line, NULL, NULL); p = p1 + 1; }

1 0

avcodec/libdcadec: require first public release
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Nov 27 15:08:44 2015 -0300| [27ce53b52d0d5f2c1d59da13491b74fe73cde964] | committer: James Almer avcodec/libdcadec: require first public release Reviewed-by: Hendrik Leppkes <h.leppkes(a)gmail.com> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=27ce53b52d0d5f2c1… --- configure | 4 +--- libavcodec/libdcadec.c | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 8cbd5e5..a30d831 100755 --- a/configure +++ b/configure @@ -1883,7 +1883,6 @@ TYPES_LIST=" CONDITION_VARIABLE_Ptr socklen_t struct_addrinfo - struct_dcadec_exss_info_matrix_encoding struct_group_source_req struct_ip_mreq_source struct_ipv6_mreq @@ -5348,8 +5347,7 @@ enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && { check_lib celt/celt.h celt_decoder_create_custom -lcelt0 || die "ERROR: libcelt must be installed and version must be >= 0.11.0."; } enabled libcaca && require_pkg_config caca caca.h caca_create_canvas -enabled libdcadec && require_pkg_config dcadec libdcadec/dca_context.h dcadec_context_create && - check_struct libdcadec/dca_context.h "struct dcadec_exss_info" matrix_encoding +enabled libdcadec && require_pkg_config "dcadec >= 0.1.0" libdcadec/dca_context.h dcadec_context_create enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac enabled libfdk_aac && { use_pkg_config fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac && diff --git a/libavcodec/libdcadec.c b/libavcodec/libdcadec.c index a0e34f9..e802076 100644 --- a/libavcodec/libdcadec.c +++ b/libavcodec/libdcadec.c @@ -42,7 +42,7 @@ static int dcadec_decode_frame(AVCodecContext *avctx, void *data, { DCADecContext *s = avctx->priv_data; AVFrame *frame = data; - av_unused struct dcadec_exss_info *exss; + struct dcadec_exss_info *exss; int ret, i, k; int **samples, nsamples, channel_mask, sample_rate, bits_per_sample, profile; uint32_t mrk; @@ -78,6 +78,8 @@ static int dcadec_decode_frame(AVCodecContext *avctx, void *data, &sample_rate, &bits_per_sample, &profile)) < 0) { av_log(avctx, AV_LOG_ERROR, "dcadec_context_filter() failed: %d (%s)\n", -ret, dcadec_strerror(ret)); return AVERROR_EXTERNAL; + } else if (ret > 0) { + av_log(avctx, AV_LOG_WARNING, "dcadec_context_filter() warning: %d (%s)\n", ret, dcadec_strerror(ret)); } avctx->channels = av_get_channel_layout_nb_channels(channel_mask); @@ -129,7 +131,6 @@ static int dcadec_decode_frame(AVCodecContext *avctx, void *data, } else avctx->bit_rate = 0; -#if HAVE_STRUCT_DCADEC_EXSS_INFO_MATRIX_ENCODING if (exss = dcadec_context_get_exss_info(s->ctx)) { enum AVMatrixEncoding matrix_encoding = AV_MATRIX_ENCODING_NONE; @@ -158,7 +159,6 @@ static int dcadec_decode_frame(AVCodecContext *avctx, void *data, (ret = ff_side_data_update_matrix_encoding(frame, matrix_encoding)) < 0) return ret; } -#endif frame->nb_samples = nsamples; if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)

1 0

configure: Add user options to enable gcrypt/gmp for rtmp(t)e support.
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Matt Oliver <protogonoi(a)gmail.com> | Sun Nov 22 02:16:36 2015 +1100| [26a84e2dae4007628d30cae746822486076767ee] | committer: Matt Oliver configure: Add user options to enable gcrypt/gmp for rtmp(t)e support. Signed-off-by: Matt Oliver <protogonoi(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=26a84e2dae4007628… --- configure | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 400b98f..8cbd5e5 100755 --- a/configure +++ b/configure @@ -199,6 +199,10 @@ External library support: --enable-chromaprint enable audio fingerprinting with chromaprint [no] --enable-fontconfig enable fontconfig, useful for drawtext filter [no] --enable-frei0r enable frei0r video filtering [no] + --enable-gcrypt enable gcrypt, needed for rtmp(t)e support + if openssl, librtmp or gmp is not used [no] + --enable-gmp enable gmp, needed for rtmp(t)e support + if openssl or librtmp is not used [no] --enable-gnutls enable gnutls, needed for https support if openssl is not used [no] --disable-iconv disable iconv [autodetect] @@ -1395,6 +1399,8 @@ EXTERNAL_LIBRARY_LIST=" crystalhd decklink frei0r + gcrypt + gmp gnutls iconv ladspa @@ -1946,8 +1952,6 @@ CONFIG_EXTRA=" fmtconvert frame_thread_encoder g722dsp - gcrypt - gmp golomb gplv3 h263dsp @@ -4763,6 +4767,7 @@ die_license_disabled nonfree nvenc enabled gpl && die_license_disabled_gpl nonfree libfdk_aac enabled gpl && die_license_disabled_gpl nonfree openssl +die_license_disabled version3 gmp die_license_disabled version3 libopencore_amrnb die_license_disabled version3 libopencore_amrwb die_license_disabled version3 libsmbclient @@ -5330,6 +5335,8 @@ enabled avisynth && { { check_lib2 "windows.h" LoadLibrary; } || enabled chromaprint && require chromaprint chromaprint.h chromaprint_get_version -lchromaprint enabled decklink && { check_header DeckLinkAPI.h || die "ERROR: DeckLinkAPI.h header not found"; } enabled frei0r && { check_header frei0r.h || die "ERROR: frei0r.h header not found"; } +enabled gcrypt && require2 gcrypt gcrypt.h gcry_mpi_new -lgcrypt +enabled gmp && require2 gmp gmp.h mpz_export -lgmp enabled gnutls && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init enabled ladspa && { check_header ladspa.h || die "ERROR: ladspa.h header not found"; } enabled libiec61883 && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883 @@ -5478,11 +5485,6 @@ enabled openssl && { check_lib openssl/ssl.h SSL_library_init -lssl -l die "ERROR: openssl not found"; } enabled qtkit_indev && { check_header_oc QTKit/QTKit.h || disable qtkit_indev; } -if enabled gnutls; then - { check_lib2 gmp.h mpz_export -lgmp && enable gmp; } || - { check_lib gcrypt.h gcry_mpi_new -lgcrypt && enable gcrypt; } -fi - # libdc1394 check if enabled libdc1394; then { require_pkg_config libdc1394-2 dc1394/dc1394.h dc1394_new &&

1 0

Merge commit '0e2395293bff089536b97131b32fea8b58bca0ba'
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Sun Nov 29 16:17:36 2015 +0100| [2ee89553aafee6b8f8df0e7f602ac331ceeded3e] | committer: Hendrik Leppkes Merge commit '0e2395293bff089536b97131b32fea8b58bca0ba' * commit '0e2395293bff089536b97131b32fea8b58bca0ba': nut: Mark non-fatal errors as warnings Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ee89553aafee6b8f… ---

1 0

nut: Mark non-fatal errors as warnings
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Tue Nov 24 01:25:04 2015 +0100| [0e2395293bff089536b97131b32fea8b58bca0ba] | committer: Luca Barbato nut: Mark non-fatal errors as warnings And make one more informative. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e2395293bff08953… --- libavformat/nutdec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index e560a7e..17ae522 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -532,7 +532,9 @@ static int decode_info_header(NUTContext *nut) } if (stream_id_plus1 > s->nb_streams) { - av_log(s, AV_LOG_ERROR, "invalid stream id for info packet\n"); + av_log(s, AV_LOG_WARNING, + "invalid stream id %d for info packet\n", + stream_id_plus1); continue; } @@ -613,7 +615,7 @@ static int find_and_decode_index(NUTContext *nut) avio_seek(bc, filesize - 12, SEEK_SET); avio_seek(bc, filesize - avio_rb64(bc), SEEK_SET); if (avio_rb64(bc) != INDEX_STARTCODE) { - av_log(s, AV_LOG_ERROR, "no index at the end\n"); + av_log(s, AV_LOG_WARNING, "no index at the end\n"); return ret; }

1 0

Merge commit '62f72b40c0b0d2cd6a2b81977287fa01d9f4ca6d'
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Sun Nov 29 16:16:15 2015 +0100| [2e4d10ae553a867a222d4e4e0a0dfd1dc1b70b97] | committer: Hendrik Leppkes Merge commit '62f72b40c0b0d2cd6a2b81977287fa01d9f4ca6d' * commit '62f72b40c0b0d2cd6a2b81977287fa01d9f4ca6d': nut: Provide more information on failure Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2e4d10ae553a867a2… ---

1 0

nut: Provide more information on failure
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Tue Nov 24 01:24:47 2015 +0100| [62f72b40c0b0d2cd6a2b81977287fa01d9f4ca6d] | committer: Luca Barbato nut: Provide more information on failure > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=62f72b40c0b0d2cd6… --- libavformat/nutdec.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index bf1ab7b..e560a7e 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -238,7 +238,9 @@ static int decode_main_header(NUTContext *nut) GET_V(nut->time_base[i].num, tmp > 0 && tmp < (1ULL << 31)); GET_V(nut->time_base[i].den, tmp > 0 && tmp < (1ULL << 31)); if (av_gcd(nut->time_base[i].num, nut->time_base[i].den) != 1) { - av_log(s, AV_LOG_ERROR, "time base invalid\n"); + av_log(s, AV_LOG_ERROR, "invalid time base %d/%d\n", + nut->time_base[i].num, + nut->time_base[i].den); return AVERROR_INVALIDDATA; } } @@ -281,7 +283,8 @@ static int decode_main_header(NUTContext *nut) return AVERROR_INVALIDDATA; } if (tmp_stream >= stream_count) { - av_log(s, AV_LOG_ERROR, "illegal stream number\n"); + av_log(s, AV_LOG_ERROR, "illegal stream number %d >= %d\n", + tmp_stream, stream_count); return AVERROR_INVALIDDATA; } @@ -309,11 +312,13 @@ static int decode_main_header(NUTContext *nut) for (i = 1; i < nut->header_count; i++) { uint8_t *hdr; GET_V(nut->header_len[i], tmp > 0 && tmp < 256); - rem -= nut->header_len[i]; - if (rem < 0) { - av_log(s, AV_LOG_ERROR, "invalid elision header\n"); + if (rem < nut->header_len[i]) { + av_log(s, AV_LOG_ERROR, + "invalid elision header %d : %d > %d\n", + i, nut->header_len[i], rem); return AVERROR_INVALIDDATA; } + rem -= nut->header_len[i]; hdr = av_malloc(nut->header_len[i]); if (!hdr) return AVERROR(ENOMEM);

1 0