May 2018 - ffmpeg-cvslog - lists.ffmpeg.org

cmdutils: dump supported hardware devices in print_codec()
by Jun Zhao 28 May '18

28 May '18

ffmpeg | branch: master | Jun Zhao <mypopydev(a)gmail.com> | Sat May 26 20:57:45 2018 +0800| [81b77e7bf16a754005a2af7e5cf35e2eefc91a39] | committer: Jun Zhao cmdutils: dump supported hardware devices in print_codec() dump the supported hardware devices for codec when use the command like ./ffmpeg -h decoder=h264. Signed-off-by: Jun Zhao <mypopydev(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=81b77e7bf16a75400… --- fftools/cmdutils.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 70234b8923..844f43359c 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -1444,6 +1444,17 @@ static void print_codec(const AVCodec *c) printf("\n"); } + if (avcodec_get_hw_config(c, 0)) { + printf(" Supported hardware devices: "); + for (int i = 0;; i++) { + const AVCodecHWConfig *config = avcodec_get_hw_config(c, i); + if (!config) + break; + printf("%s ", av_hwdevice_get_type_name(config->device_type)); + } + printf("\n"); + } + if (c->supported_framerates) { const AVRational *fps = c->supported_framerates;

1 0

cmdutils: print missing caps in print_codec().
by Jun Zhao 28 May '18

28 May '18

ffmpeg | branch: master | Jun Zhao <mypopydev(a)gmail.com> | Fri May 25 14:57:48 2018 +0800| [90acf168a6e29713f7d1d24f3f39f1c3207a2915] | committer: Jun Zhao cmdutils: print missing caps in print_codec(). print full caps type in print_codec(). Signed-off-by: Jun Zhao <mypopydev(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90acf168a6e29713f… --- fftools/cmdutils.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 8ffc9d240b..70234b8923 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -1414,6 +1414,16 @@ static void print_codec(const AVCodec *c) AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_AUTO_THREADS)) printf("threads "); + if (c->capabilities & AV_CODEC_CAP_AVOID_PROBING) + printf("avoidprobe "); + if (c->capabilities & AV_CODEC_CAP_INTRA_ONLY) + printf("intraonly "); + if (c->capabilities & AV_CODEC_CAP_LOSSLESS) + printf("lossless "); + if (c->capabilities & AV_CODEC_CAP_HARDWARE) + printf("hardware "); + if (c->capabilities & AV_CODEC_CAP_HYBRID) + printf("hybrid "); if (!c->capabilities) printf("none"); printf("\n");

1 0

avformat/dashenc: Added a warning for incorrect segment name extension
by Karthick Jeyapal 28 May '18

28 May '18

ffmpeg | branch: master | Karthick Jeyapal <kjeyapal(a)akamai.com> | Mon May 14 11:39:46 2018 +0530| [ebf85d319087025585d31198ed691035267221b6] | committer: Karthick Jeyapal avformat/dashenc: Added a warning for incorrect segment name extension Applicable only to webm output format. By default all the segment filenames end with .m4s extension. When someone chooses webm output format, we recommend they also override the relevant segment name options to end with .webm extension. This patch will issue a warning for he same > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ebf85d31908702558… --- libavformat/dashenc.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 56af916555..a9b8b1d4f6 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -196,6 +196,16 @@ static const char *get_format_str(SegmentType segment_type) { return NULL; } +static int check_file_extension(const char *filename, const char *extension) { + char *dot; + if (!filename || !extension) + return -1; + dot = strrchr(filename, '.'); + if (dot && !strcmp(dot + 1, extension)) + return 0; + return -1; +} + static void set_vp9_codec_str(AVFormatContext *s, AVCodecParameters *par, AVRational *frame_rate, char *str, int size) { VPCC vpcc; @@ -987,6 +997,17 @@ static int dash_init(AVFormatContext *s) c->format_name = get_format_str(c->segment_type); if (!c->format_name) return AVERROR_MUXER_NOT_FOUND; + if (c->segment_type == SEGMENT_TYPE_WEBM) { + if ((!c->single_file && check_file_extension(c->init_seg_name, c->format_name) != 0) || + (!c->single_file && check_file_extension(c->media_seg_name, c->format_name) != 0) || + (c->single_file && check_file_extension(c->single_file_name, c->format_name) != 0)) { + av_log(s, AV_LOG_WARNING, + "One or many segment file names doesn't end with .webm. " + "Override -init_seg_name and/or -media_seg_name and/or " + "-single_file_name to end with the extension .webm\n"); + } + } + ctx->oformat = av_guess_format(c->format_name, NULL, NULL); if (!ctx->oformat) return AVERROR_MUXER_NOT_FOUND;

1 0

avformat/dashenc: Added option for Segment file format
by Karthick Jeyapal 28 May '18

28 May '18

ffmpeg | branch: master | Karthick Jeyapal <kjeyapal(a)akamai.com> | Fri May 4 11:03:58 2018 +0530| [2efdbf7367989cf9d296c25fa3d2aff8d6e25fdd] | committer: Karthick Jeyapal avformat/dashenc: Added option for Segment file format Right now segment file format is chosen to be either mp4 or webm based on the codec format. This patch makes that choice configurable by the user, instead of being decided by the muxer. Also with this change per-stream choice segment file format(based on codec type) is not possible. All the output audio and video streams should be in the same file format. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2efdbf7367989cf9d… --- doc/muxers.texi | 9 +++++++ libavformat/dashenc.c | 67 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 48 insertions(+), 28 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 59e20bf426..80c65420ba 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -288,6 +288,15 @@ the segment indexes fall behind the expected real time position. Set container format (mp4/webm) options using a @code{:} separated list of key=value parameters. Values containing @code{:} special characters must be escaped. + +@item dash_segment_type @var{dash_segment_type} +Possible values: +@item mp4 +If this flag is set, the dash segment files will be in in ISOBMFF format. This is the default format. + +@item webm +If this flag is set, the dash segment files will be in in WebM format. + @end table @anchor{framecrc} diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index e27b61c096..56af916555 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -48,6 +48,12 @@ #include "vpcc.h" #include "dash.h" +typedef enum { + SEGMENT_TYPE_MP4 = 0, + SEGMENT_TYPE_WEBM, + SEGMENT_TYPE_NB +} SegmentType; + typedef struct Segment { char file[1024]; int64_t start_pos; @@ -69,7 +75,6 @@ typedef struct OutputStream { AVFormatContext *ctx; int ctx_inited, as_idx; AVIOContext *out; - char format_name[8]; int packets_written; char initfile[1024]; int64_t init_start_pos, pos; @@ -126,6 +131,8 @@ typedef struct DASHContext { int64_t timeout; int index_correction; char *format_options_str; + SegmentType segment_type; + const char *format_name; } DASHContext; static struct codec_string { @@ -139,6 +146,15 @@ static struct codec_string { { 0, NULL } }; +static struct format_string { + SegmentType segment_type; + const char *str; +} formats[] = { + { SEGMENT_TYPE_MP4, "mp4" }, + { SEGMENT_TYPE_WEBM, "webm" }, + { 0, NULL } +}; + static int dashenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename, AVDictionary **options) { DASHContext *c = s->priv_data; @@ -172,6 +188,14 @@ static void dashenc_io_close(AVFormatContext *s, AVIOContext **pb, char *filenam } } +static const char *get_format_str(SegmentType segment_type) { + int i; + for (i = 0; i < SEGMENT_TYPE_NB; i++) + if (formats[i].segment_type == segment_type) + return formats[i].str; + return NULL; +} + static void set_vp9_codec_str(AVFormatContext *s, AVCodecParameters *par, AVRational *frame_rate, char *str, int size) { VPCC vpcc; @@ -582,13 +606,13 @@ static int write_adaptation_set(AVFormatContext *s, AVIOContext *out, int as_ind if (as->media_type == AVMEDIA_TYPE_VIDEO) { AVStream *st = s->streams[i]; avio_printf(out, "\t\t\t<Representation id=\"%d\" mimeType=\"video/%s\" codecs=\"%s\"%s width=\"%d\" height=\"%d\"", - i, os->format_name, os->codec_str, bandwidth_str, s->streams[i]->codecpar->width, s->streams[i]->codecpar->height); + i, c->format_name, os->codec_str, bandwidth_str, s->streams[i]->codecpar->width, s->streams[i]->codecpar->height); if (st->avg_frame_rate.num) avio_printf(out, " frameRate=\"%d/%d\"", st->avg_frame_rate.num, st->avg_frame_rate.den); avio_printf(out, ">\n"); } else { avio_printf(out, "\t\t\t<Representation id=\"%d\" mimeType=\"audio/%s\" codecs=\"%s\"%s audioSamplingRate=\"%d\">\n", - i, os->format_name, os->codec_str, bandwidth_str, s->streams[i]->codecpar->sample_rate); + i, c->format_name, os->codec_str, bandwidth_str, s->streams[i]->codecpar->sample_rate); avio_printf(out, "\t\t\t\t<AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\" />\n", s->streams[i]->codecpar->channels); } @@ -960,27 +984,10 @@ static int dash_init(AVFormatContext *s) if (!ctx) return AVERROR(ENOMEM); - // choose muxer based on codec: webm for VP8 and opus, mp4 otherwise - // note: os->format_name is also used as part of the mimetype of the - // representation, e.g. video/<format_name> - if (s->streams[i]->codecpar->codec_id == AV_CODEC_ID_VP8 || - s->streams[i]->codecpar->codec_id == AV_CODEC_ID_OPUS || - s->streams[i]->codecpar->codec_id == AV_CODEC_ID_VORBIS) { - snprintf(os->format_name, sizeof(os->format_name), "webm"); - - if (s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { - av_log(s, AV_LOG_ERROR, - "WebM support in dashenc is experimental and has not " - "been validated. For testing purposes, make sure " - "to add -strict experimental and override " - "-init_seg_name and -media_seg_name to end with " - "the extension 'webm'.\n"); - return AVERROR(EINVAL); - } - } else { - snprintf(os->format_name, sizeof(os->format_name), "mp4"); - } - ctx->oformat = av_guess_format(os->format_name, NULL, NULL); + c->format_name = get_format_str(c->segment_type); + if (!c->format_name) + return AVERROR_MUXER_NOT_FOUND; + ctx->oformat = av_guess_format(c->format_name, NULL, NULL); if (!ctx->oformat) return AVERROR_MUXER_NOT_FOUND; os->ctx = ctx; @@ -1023,7 +1030,8 @@ static int dash_init(AVFormatContext *s) if (ret < 0) return ret; } - if (!strcmp(os->format_name, "mp4")) { + + if (c->segment_type == SEGMENT_TYPE_MP4) { if (c->streaming) av_dict_set(&opts, "movflags", "frag_every_frame+dash+delay_moov", 0); else @@ -1088,7 +1096,7 @@ static int dash_write_header(AVFormatContext *s) // Flush init segment // Only for WebM segment, since for mp4 delay_moov is set and // the init segment is thus flushed after the first packets. - if (strcmp(os->format_name, "mp4") && + if (c->segment_type == SEGMENT_TYPE_WEBM && (ret = flush_init_segment(s, os)) < 0) return ret; } @@ -1259,7 +1267,7 @@ static int dash_flush(AVFormatContext *s, int final, int stream) } if (!c->single_file) { - if (!strcmp(os->format_name, "mp4") && !os->written_len) + if (c->segment_type == SEGMENT_TYPE_MP4 && !os->written_len) write_styp(os->ctx->pb); } else { snprintf(os->full_path, sizeof(os->full_path), "%s%s", c->dirname, os->initfile); @@ -1449,7 +1457,7 @@ static int dash_write_packet(AVFormatContext *s, AVPacket *pkt) } //write out the data immediately in streaming mode - if (c->streaming && !strcmp(os->format_name, "mp4")) { + if (c->streaming && c->segment_type == SEGMENT_TYPE_MP4) { int len = 0; uint8_t *buf = NULL; if (!os->written_len) @@ -1545,6 +1553,9 @@ static const AVOption options[] = { { "timeout", "set timeout for socket I/O operations", OFFSET(timeout), AV_OPT_TYPE_DURATION, { .i64 = -1 }, -1, INT_MAX, .flags = E }, { "index_correction", "Enable/Disable segment index correction logic", OFFSET(index_correction), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E }, { "format_options","set list of options for the container format (mp4/webm) used for dash", OFFSET(format_options_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, + { "dash_segment_type", "set dash segment files type", OFFSET(segment_type), AV_OPT_TYPE_INT, {.i64 = SEGMENT_TYPE_MP4 }, 0, SEGMENT_TYPE_NB - 1, E, "segment_type"}, + { "mp4", "make segment file in ISOBMFF format", 0, AV_OPT_TYPE_CONST, {.i64 = SEGMENT_TYPE_MP4 }, 0, UINT_MAX, E, "segment_type"}, + { "webm", "make segment file in WebM format", 0, AV_OPT_TYPE_CONST, {.i64 = SEGMENT_TYPE_WEBM }, 0, UINT_MAX, E, "segment_type"}, { NULL }, };

1 0

avcodec/ac3dec: Check that the number of channels with dependant streams is valid
by Michael Niedermayer 27 May '18

27 May '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri May 25 22:55:19 2018 +0200| [e3275f937dc38e740c74539f2f6aad5bfdba2bf1] | committer: Michael Niedermayer avcodec/ac3dec: Check that the number of channels with dependant streams is valid Fixes: left shift of 1 by 63 places cannot be represented in type 'long long' Fixes: out of array access Fixes: 7284/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AC3_fuzzer-5767914968842240 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e3275f937dc38e740… --- libavcodec/ac3dec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 317b2bd800..dfa025cbcc 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -1702,6 +1702,11 @@ dependent_frame: channel_layout |= custom_channel_map_locations[ch][1]; } } + if (av_get_channel_layout_nb_channels(channel_layout) > EAC3_MAX_CHANNELS) { + av_log(avctx, AV_LOG_ERROR, "Too many channels (%d) coded\n", + av_get_channel_layout_nb_channels(channel_layout)); + return AVERROR_INVALIDDATA; + } avctx->channel_layout = channel_layout; avctx->channels = av_get_channel_layout_nb_channels(channel_layout);

1 0

avcodec/ac3dec: Fix null pointer dereference in ac3_decode_frame()
by Michael Niedermayer 27 May '18

27 May '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri May 25 22:22:27 2018 +0200| [e3f656f2dea6ef6e2a14e72931f3d6f205f732c8] | committer: Michael Niedermayer avcodec/ac3dec: Fix null pointer dereference in ac3_decode_frame() Fixes: index 8 out of bounds for type 'uint8_t *[8]' Fixes: 7273/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EAC3_fuzzer-6296497667702784 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e3f656f2dea6ef6e2… --- libavcodec/ac3dec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 1d3180b935..317b2bd800 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -1738,7 +1738,9 @@ dependent_frame: for (ch = 0; ch < avctx->channels; ch++) { int map = extended_channel_map[ch]; - memcpy((SHORTFLOAT *)frame->data[ch], s->output_buffer[map], + av_assert0(ch>=AV_NUM_DATA_POINTERS || frame->extended_data[ch] == frame->data[ch]); + memcpy((SHORTFLOAT *)frame->extended_data[ch], + s->output_buffer[map], s->num_blocks * AC3_BLOCK_SIZE * sizeof(SHORTFLOAT)); }

1 0

avcodec/aacdec_fixed: use 64bit to avoid overflow in rounding in apply_dependent_coupling_fixed()
by Michael Niedermayer 27 May '18

27 May '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri May 25 22:06:48 2018 +0200| [90475db97e2e5931d295df6ab86519fa2e14d259] | committer: Michael Niedermayer avcodec/aacdec_fixed: use 64bit to avoid overflow in rounding in apply_dependent_coupling_fixed() Fixes: signed integer overflow: -2141499320 + -14469590 cannot be represented in type 'int' Fixes: 7351/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-6351214791884800 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90475db97e2e5931d… --- libavcodec/aacdec_fixed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c index 5c3613e06c..167f5b68a1 100644 --- a/libavcodec/aacdec_fixed.c +++ b/libavcodec/aacdec_fixed.c @@ -385,7 +385,7 @@ static void apply_dependent_coupling_fixed(AACContext *ac, for (k = offsets[i]; k < offsets[i + 1]; k++) { tmp = (int)(((int64_t)src[group * 128 + k] * c + \ (int64_t)0x1000000000) >> 37); - dest[group * 128 + k] += (tmp + round) >> shift; + dest[group * 128 + k] += (tmp + (int64_t)round) >> shift; } } }

1 0

oavcodec/aacpsdsp_template: Use unsigned for hs0X to prevent undefined behavior
by Michael Niedermayer 27 May '18

27 May '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri May 25 22:02:20 2018 +0200| [62cb6fadf33de6db386deac92853d4b95c930015] | committer: Michael Niedermayer oavcodec/aacpsdsp_template: Use unsigned for hs0X to prevent undefined behavior Fixes: signed integer overflow: 1073741842 + 1784008138 cannot be represented in type 'int' Fixes: 6792/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-5677589835284480 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=62cb6fadf33de6db3… --- libavcodec/aacpsdsp_template.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/aacpsdsp_template.c b/libavcodec/aacpsdsp_template.c index 19be200653..65867649c7 100644 --- a/libavcodec/aacpsdsp_template.c +++ b/libavcodec/aacpsdsp_template.c @@ -181,10 +181,10 @@ static void ps_stereo_interpolate_ipdopd_c(INTFLOAT (*l)[2], INTFLOAT (*r)[2], INTFLOAT h01 = h[0][1], h11 = h[1][1]; INTFLOAT h02 = h[0][2], h12 = h[1][2]; INTFLOAT h03 = h[0][3], h13 = h[1][3]; - INTFLOAT hs00 = h_step[0][0], hs10 = h_step[1][0]; - INTFLOAT hs01 = h_step[0][1], hs11 = h_step[1][1]; - INTFLOAT hs02 = h_step[0][2], hs12 = h_step[1][2]; - INTFLOAT hs03 = h_step[0][3], hs13 = h_step[1][3]; + UINTFLOAT hs00 = h_step[0][0], hs10 = h_step[1][0]; + UINTFLOAT hs01 = h_step[0][1], hs11 = h_step[1][1]; + UINTFLOAT hs02 = h_step[0][2], hs12 = h_step[1][2]; + UINTFLOAT hs03 = h_step[0][3], hs13 = h_step[1][3]; int n; for (n = 0; n < len; n++) {

1 0

avcodec/g723_1dec: Clip bits2 in both directions
by Michael Niedermayer 27 May '18

27 May '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri May 25 21:56:04 2018 +0200| [53f241218d9eac368e2e1c58bcca9bbdf10fd0e1] | committer: Michael Niedermayer avcodec/g723_1dec: Clip bits2 in both directions Fixes: shift exponent 33 is too large for 32-bit type 'int' Fixes: 6743/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G723_1_fuzzer-5823772687859712 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=53f241218d9eac368… --- libavcodec/g723_1dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/g723_1dec.c b/libavcodec/g723_1dec.c index c8202a937c..ab952ec66d 100644 --- a/libavcodec/g723_1dec.c +++ b/libavcodec/g723_1dec.c @@ -549,7 +549,7 @@ static void gain_scale(G723_1_Context *p, int16_t * buf, int energy) denom <<= bits2; bits2 = 5 + bits1 - bits2; - bits2 = FFMAX(0, bits2); + bits2 = av_clip_uintp2(bits2, 5); gain = (num >> 1) / (denom >> 16); gain = square_root(gain << 16 >> bits2);

1 0

avcodec/mpeg4videoenc: Use 64 bit for times in mpeg4_encode_gop_header()
by Michael Niedermayer 27 May '18

27 May '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon May 21 23:08:05 2018 +0200| [e1182fac1afba92a4975917823a5f644bee7e6e8] | committer: Michael Niedermayer avcodec/mpeg4videoenc: Use 64 bit for times in mpeg4_encode_gop_header() Fixes truncation Fixes Assertion n <= 31 && value < (1U << n) failed at libavcodec/put_bits.h:169 Fixes: ffmpeg_crash_2.avi Found-by: Thuan Pham <thuanpv(a)comp.nus.edu.sg>, Marcel Böhme, Andrew Santosa and Alexandru RazvanCaciulescu with AFLSmart Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1182fac1afba92a4… --- libavcodec/mpeg4videoenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 494452c938..f6a5992df7 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -882,7 +882,7 @@ void ff_set_mpeg4_time(MpegEncContext *s) static void mpeg4_encode_gop_header(MpegEncContext *s) { - int hours, minutes, seconds; + int64_t hours, minutes, seconds; int64_t time; put_bits(&s->pb, 16, 0);

1 0