August 2019 - ffmpeg-cvslog - lists.ffmpeg.org

avformat/mpsubdec: Remove floating point usage
by Michael Niedermayer 29 Aug '19

29 Aug '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Tue Jul 30 19:11:27 2019 +0200| [e0c973e5bea94dc70baf20d5a36e123b1ca1f901] | committer: Michael Niedermayer avformat/mpsubdec: Remove floating point usage This makes the code bitexact between platforms. Intermediate timestamps between frames are preserved. The timebase is simplified. Rounding differs from doubles in cases where timestamps/durations are "funny" Suggested-by: jb Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e0c973e5bea94dc70… --- libavformat/mpsubdec.c | 84 ++++++++++++++++++++++++++++++++--------- tests/ref/fate/sub-mpsub-frames | 4 +- 2 files changed, 69 insertions(+), 19 deletions(-) diff --git a/libavformat/mpsubdec.c b/libavformat/mpsubdec.c index a8217a4a61..3d8dcb35c2 100644 --- a/libavformat/mpsubdec.c +++ b/libavformat/mpsubdec.c @@ -27,6 +27,8 @@ #include "internal.h" #include "subtitles.h" +#define TSBASE 10000000 + typedef struct { FFDemuxSubtitlesQueue q; } MPSubContext; @@ -51,21 +53,55 @@ static int mpsub_probe(const AVProbeData *p) return 0; } +static int parse_line(const char *line, int64_t *value, int64_t *value2) +{ + int vi, p1, p2; + + for (vi = 0; vi < 2; vi++) { + long long intval, fracval; + int n = av_sscanf(line, "%lld%n.%lld%n", &intval, &p1, &fracval, &p2); + if (n <= 0 || intval < INT64_MIN / TSBASE || intval > INT64_MAX / TSBASE) + return AVERROR_INVALIDDATA; + + intval *= TSBASE; + + if (n == 2) { + if (fracval < 0) + return AVERROR_INVALIDDATA; + for (;p2 - p1 < 7 + 1; p1--) + fracval *= 10; + for (;p2 - p1 > 7 + 1; p1++) + fracval /= 10; + if (intval > 0) intval += fracval; + else intval -= fracval; + line += p2; + } else + line += p1; + + *value = intval; + + value = value2; + } + + return 0; +} + static int mpsub_read_header(AVFormatContext *s) { MPSubContext *mpsub = s->priv_data; AVStream *st; AVBPrint buf; - AVRational pts_info = (AVRational){ 100, 1 }; // ts based by default + AVRational pts_info = (AVRational){ TSBASE, 1 }; // ts based by default int res = 0; - int multiplier = 100; - double current_pts = 0; + int64_t current_pts = 0; + int i; + int common_factor = 0; av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); while (!avio_feof(s->pb)) { char line[1024]; - double start, duration; + int64_t start, duration; int fps, len = ff_get_line(s->pb, line, sizeof(line)); if (!len) @@ -75,34 +111,48 @@ static int mpsub_read_header(AVFormatContext *s) if (sscanf(line, "FORMAT=%d", &fps) == 1 && fps > 3 && fps < 100) { /* frame based timing */ - pts_info = (AVRational){ fps, 1 }; - multiplier = 1; - } else if (sscanf(line, "%lf %lf", &start, &duration) == 2) { + pts_info = (AVRational){ TSBASE * fps, 1 }; + } else if (parse_line(line, &start, &duration) >= 0) { AVPacket *sub; const int64_t pos = avio_tell(s->pb); ff_subtitles_read_chunk(s->pb, &buf); if (buf.len) { - double ts = current_pts + start*multiplier; sub = ff_subtitles_queue_insert(&mpsub->q, buf.str, buf.len, 0); if (!sub) { res = AVERROR(ENOMEM); goto end; } - if (!isfinite(ts) || ts < INT64_MIN || ts > INT64_MAX) { - avpriv_request_sample(s, "Invalid ts\n"); - } else - sub->pts = (int64_t)ts; - if (!isfinite(duration) || duration * multiplier > INT_MAX || duration < 0) { - avpriv_request_sample(s, "Invalid duration\n"); - } else - sub->duration = (int)(duration * multiplier); - current_pts += (start + duration) * multiplier; + if ( current_pts < 0 && start < INT64_MIN - current_pts + || current_pts > 0 && start > INT64_MAX - current_pts) { + res = AVERROR_INVALIDDATA; + goto end; + } + sub->pts = current_pts + start; + if (duration < 0 || sub->pts > INT64_MAX - duration) { + res = AVERROR_INVALIDDATA; + goto end; + } + sub->duration = duration; + + common_factor = av_gcd(duration, common_factor); + common_factor = av_gcd(sub->pts, common_factor); + + current_pts = sub->pts + duration; sub->pos = pos; } } } + if (common_factor > 1) { + common_factor = av_gcd(pts_info.num, common_factor); + for (i = 0; i < mpsub->q.nb_subs; i++) { + mpsub->q.subs[i].pts /= common_factor; + mpsub->q.subs[i].duration /= common_factor; + } + pts_info.num /= common_factor; + } + st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); diff --git a/tests/ref/fate/sub-mpsub-frames b/tests/ref/fate/sub-mpsub-frames index 64528ec70e..17695787be 100644 --- a/tests/ref/fate/sub-mpsub-frames +++ b/tests/ref/fate/sub-mpsub-frames @@ -10,5 +10,5 @@ Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10 [Events] Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:01.00,0:00:02.48,Default,,0,0,0,,Start at 1sec,\Nlast 1.5 seconds -Dialogue: 0,0:00:02.52,0:00:11.52,Default,,0,0,0,,One frame later,\Nduring 9 seconds +Dialogue: 0,0:00:01.00,0:00:02.50,Default,,0,0,0,,Start at 1sec,\Nlast 1.5 seconds +Dialogue: 0,0:00:02.54,0:00:11.54,Default,,0,0,0,,One frame later,\Nduring 9 seconds

1 0

lavc/cbs_h2645: Use av_realloc instead of av_malloc
by Thierry Foucu 28 Aug '19

28 Aug '19

ffmpeg | branch: master | Thierry Foucu <tfoucu(a)gmail.com> | Mon Aug 26 13:50:40 2019 -0700| [a80fdbcf13919d1280278e71c4ae29e760fb82ab] | committer: Carl Eugen Hoyos lavc/cbs_h2645: Use av_realloc instead of av_malloc Follow the description of av_realloc, the memory needs to be allocated by av_realloc. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a80fdbcf13919d128… --- libavcodec/cbs_h2645.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 69ea6dc6bb..8da8421e47 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -1457,7 +1457,7 @@ static int cbs_h2645_assemble_fragment(CodedBitstreamContext *ctx, max_size += 3 + frag->units[i].data_size * 3 / 2; } - data = av_malloc(max_size + AV_INPUT_BUFFER_PADDING_SIZE); + data = av_realloc(NULL, max_size + AV_INPUT_BUFFER_PADDING_SIZE); if (!data) return AVERROR(ENOMEM);

1 0

lavf/dump: dump the vbv_delay with N/A instead of 18446744073709551615
by Limin Wang 28 Aug '19

28 Aug '19

ffmpeg | branch: master | Limin Wang <lance.lmwang(a)gmail.com> | Tue Aug 27 22:34:54 2019 +0800| [ffd65c8862e1cb9f49f71ab30640ac0e8bdfe7ce] | committer: Michael Niedermayer lavf/dump: dump the vbv_delay with N/A instead of 18446744073709551615 How to check it: ./ffmpeg -f lavfi -i testsrc -c:v mpeg2video -f null - master: Side data: cpb: bitrate max/min/avg: 0/0/200000 buffer size: 0 vbv_delay: 18446744073709551615 patch applied: Side data: cpb: bitrate max/min/avg: 0/0/200000 buffer size: 0 vbv_delay: N/A Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Limin Wang <lance.lmwang(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ffd65c8862e1cb9f4… --- libavformat/dump.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavformat/dump.c b/libavformat/dump.c index a3791a3020..56814ff7d2 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -321,13 +321,16 @@ static void dump_cpb(void *ctx, AVPacketSideData *sd) av_log(ctx, AV_LOG_INFO, #if FF_API_UNSANITIZED_BITRATES - "bitrate max/min/avg: %d/%d/%d buffer size: %d vbv_delay: %"PRIu64, + "bitrate max/min/avg: %d/%d/%d buffer size: %d ", #else - "bitrate max/min/avg: %"PRId64"/%"PRId64"/%"PRId64" buffer size: %d vbv_delay: %"PRIu64, + "bitrate max/min/avg: %"PRId64"/%"PRId64"/%"PRId64" buffer size: %d ", #endif cpb->max_bitrate, cpb->min_bitrate, cpb->avg_bitrate, - cpb->buffer_size, - cpb->vbv_delay); + cpb->buffer_size); + if (cpb->vbv_delay == UINT64_MAX) + av_log(ctx, AV_LOG_INFO, "vbv_delay: N/A"); + else + av_log(ctx, AV_LOG_INFO, "vbv_delay: %"PRIu64"", cpb->vbv_delay); } static void dump_mastering_display_metadata(void *ctx, AVPacketSideData* sd) {

1 0

avcodec/dsd: use uint8_t instead of unsigned char
by Paul B Mahol 28 Aug '19

28 Aug '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Aug 28 17:30:55 2019 +0200| [330ba8d537b493a35b8e83ae4247ea2343ab010c] | committer: Paul B Mahol avcodec/dsd: use uint8_t instead of unsigned char > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=330ba8d537b493a35… --- libavcodec/dsd.c | 10 +++++----- libavcodec/dsd.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/dsd.c b/libavcodec/dsd.c index 8a1fc21b0d..d48f87fa0f 100644 --- a/libavcodec/dsd.c +++ b/libavcodec/dsd.c @@ -53,12 +53,12 @@ av_cold void ff_init_dsd_data(void) } void ff_dsd2pcm_translate(DSDContext* s, size_t samples, int lsbf, - const unsigned char *src, ptrdiff_t src_stride, + const uint8_t *src, ptrdiff_t src_stride, float *dst, ptrdiff_t dst_stride) { - unsigned char buf[FIFOSIZE]; + uint8_t buf[FIFOSIZE]; unsigned pos, i; - unsigned char* p; + uint8_t* p; double sum; pos = s->pos; @@ -74,8 +74,8 @@ void ff_dsd2pcm_translate(DSDContext* s, size_t samples, int lsbf, sum = 0.0; for (i = 0; i < CTABLES; i++) { - unsigned char a = buf[(pos - i) & FIFOMASK]; - unsigned char b = buf[(pos - (CTABLES*2 - 1) + i) & FIFOMASK]; + uint8_t a = buf[(pos - i) & FIFOMASK]; + uint8_t b = buf[(pos - (CTABLES*2 - 1) + i) & FIFOMASK]; sum += ctables[i][a] + ctables[i][b]; } diff --git a/libavcodec/dsd.h b/libavcodec/dsd.h index 5ca4574837..ed09cb9b12 100644 --- a/libavcodec/dsd.h +++ b/libavcodec/dsd.h @@ -40,13 +40,13 @@ * Per-channel buffer */ typedef struct DSDContext { - unsigned char buf[FIFOSIZE]; + uint8_t buf[FIFOSIZE]; unsigned pos; } DSDContext; void ff_init_dsd_data(void); void ff_dsd2pcm_translate(DSDContext* s, size_t samples, int lsbf, - const unsigned char *src, ptrdiff_t src_stride, + const uint8_t *src, ptrdiff_t src_stride, float *dst, ptrdiff_t dst_stride); #endif /* AVCODEC_DSD_H */

1 0

avcodec/dsddec: add slice threading support
by Paul B Mahol 28 Aug '19

28 Aug '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Aug 28 17:28:16 2019 +0200| [9606e4b6e68de8c5d9ffe0c829716f0d5dbf1215] | committer: Paul B Mahol avcodec/dsddec: add slice threading support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9606e4b6e68de8c5d… --- libavcodec/dsd.c | 12 ++++++++---- libavcodec/dsddec.c | 47 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/libavcodec/dsd.c b/libavcodec/dsd.c index 9104f38476..8a1fc21b0d 100644 --- a/libavcodec/dsd.c +++ b/libavcodec/dsd.c @@ -56,23 +56,26 @@ void ff_dsd2pcm_translate(DSDContext* s, size_t samples, int lsbf, const unsigned char *src, ptrdiff_t src_stride, float *dst, ptrdiff_t dst_stride) { + unsigned char buf[FIFOSIZE]; unsigned pos, i; unsigned char* p; double sum; pos = s->pos; + memcpy(buf, s->buf, sizeof(buf)); + while (samples-- > 0) { - s->buf[pos] = lsbf ? ff_reverse[*src] : *src; + buf[pos] = lsbf ? ff_reverse[*src] : *src; src += src_stride; - p = s->buf + ((pos - CTABLES) & FIFOMASK); + p = buf + ((pos - CTABLES) & FIFOMASK); *p = ff_reverse[*p]; sum = 0.0; for (i = 0; i < CTABLES; i++) { - unsigned char a = s->buf[(pos - i) & FIFOMASK]; - unsigned char b = s->buf[(pos - (CTABLES*2 - 1) + i) & FIFOMASK]; + unsigned char a = buf[(pos - i) & FIFOMASK]; + unsigned char b = buf[(pos - (CTABLES*2 - 1) + i) & FIFOMASK]; sum += ctables[i][a] + ctables[i][b]; } @@ -83,4 +86,5 @@ void ff_dsd2pcm_translate(DSDContext* s, size_t samples, int lsbf, } s->pos = pos; + memcpy(s->buf, buf, sizeof(buf)); } diff --git a/libavcodec/dsddec.c b/libavcodec/dsddec.c index 2c5c357acc..7c3ae15768 100644 --- a/libavcodec/dsddec.c +++ b/libavcodec/dsddec.c @@ -61,17 +61,20 @@ static av_cold int decode_init(AVCodecContext *avctx) return 0; } -static int decode_frame(AVCodecContext *avctx, void *data, - int *got_frame_ptr, AVPacket *avpkt) +typedef struct ThreadData { + AVFrame *frame; + AVPacket *avpkt; +} ThreadData; + +static int dsd_channel(AVCodecContext *avctx, void *tdata, int j, int threadnr) { - DSDContext * s = avctx->priv_data; - AVFrame *frame = data; - int ret, i; int lsbf = avctx->codec_id == AV_CODEC_ID_DSD_LSBF || avctx->codec_id == AV_CODEC_ID_DSD_LSBF_PLANAR; - int src_next; - int src_stride; - - frame->nb_samples = avpkt->size / avctx->channels; + DSDContext *s = avctx->priv_data; + ThreadData *td = tdata; + AVFrame *frame = td->frame; + AVPacket *avpkt = td->avpkt; + int src_next, src_stride; + float *dst = ((float **)frame->extended_data)[j]; if (avctx->codec_id == AV_CODEC_ID_DSD_LSBF_PLANAR || avctx->codec_id == AV_CODEC_ID_DSD_MSBF_PLANAR) { src_next = frame->nb_samples; @@ -81,15 +84,28 @@ static int decode_frame(AVCodecContext *avctx, void *data, src_stride = avctx->channels; } + ff_dsd2pcm_translate(&s[j], frame->nb_samples, lsbf, + avpkt->data + j * src_next, src_stride, + dst, 1); + + return 0; +} + +static int decode_frame(AVCodecContext *avctx, void *data, + int *got_frame_ptr, AVPacket *avpkt) +{ + ThreadData td; + AVFrame *frame = data; + int ret; + + frame->nb_samples = avpkt->size / avctx->channels; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; - for (i = 0; i < avctx->channels; i++) { - float * dst = ((float **)frame->extended_data)[i]; - ff_dsd2pcm_translate(&s[i], frame->nb_samples, lsbf, - avpkt->data + i * src_next, src_stride, - dst, 1); - } + td.frame = frame; + td.avpkt = avpkt; + avctx->execute2(avctx, dsd_channel, &td, NULL, avctx->channels); *got_frame_ptr = 1; return frame->nb_samples * avctx->channels; @@ -103,6 +119,7 @@ AVCodec ff_##name_##_decoder = { \ .id = AV_CODEC_ID_##id_, \ .init = decode_init, \ .decode = decode_frame, \ + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, \ .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, \ AV_SAMPLE_FMT_NONE }, \ };

1 0

avformat/dsfdec: set packet pts/duration/pos correctly
by Paul B Mahol 28 Aug '19

28 Aug '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Jul 30 13:16:33 2019 +0200| [98f5cbcb7db455dac8b4a6cbbe0dd72ec6a892fd] | committer: Paul B Mahol avformat/dsfdec: set packet pts/duration/pos correctly > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=98f5cbcb7db455dac… --- libavformat/dsfdec.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/libavformat/dsfdec.c b/libavformat/dsfdec.c index afb24634b2..9be206af84 100644 --- a/libavformat/dsfdec.c +++ b/libavformat/dsfdec.c @@ -130,6 +130,7 @@ static int dsf_read_header(AVFormatContext *s) } st->codecpar->block_align *= st->codecpar->channels; st->codecpar->bit_rate = st->codecpar->channels * st->codecpar->sample_rate * 8LL; + avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); avio_skip(pb, 4); /* data chunk */ @@ -150,11 +151,11 @@ static int dsf_read_packet(AVFormatContext *s, AVPacket *pkt) AVIOContext *pb = s->pb; AVStream *st = s->streams[0]; int64_t pos = avio_tell(pb); + int ret; if (pos >= dsf->data_end) return AVERROR_EOF; - pkt->stream_index = 0; if (dsf->data_size > dsf->audio_size) { int last_packet = pos == (dsf->data_end - st->codecpar->block_align); @@ -180,10 +181,22 @@ static int dsf_read_packet(AVFormatContext *s, AVPacket *pkt) avio_skip(pb, skip_size / st->codecpar->channels); } + pkt->pos = pos; + pkt->stream_index = 0; + pkt->pts = (pos - s->internal->data_offset) / st->codecpar->channels; + pkt->duration = packet_size / st->codecpar->channels; return 0; } } - return av_get_packet(pb, pkt, FFMIN(dsf->data_end - pos, st->codecpar->block_align)); + ret = av_get_packet(pb, pkt, FFMIN(dsf->data_end - pos, st->codecpar->block_align)); + if (ret < 0) + return ret; + + pkt->stream_index = 0; + pkt->pts = (pos - s->internal->data_offset) / st->codecpar->channels; + pkt->duration = st->codecpar->block_align / st->codecpar->channels; + + return 0; } AVInputFormat ff_dsf_demuxer = {

1 0

avcodec/h264_refs: do not use invalid mmco values in case of error
by Paul B Mahol 28 Aug '19

28 Aug '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Aug 7 18:49:08 2019 +0200| [ef73ccc2c419a326ca87ef6573abe70a32e616c1] | committer: Paul B Mahol avcodec/h264_refs: do not use invalid mmco values in case of error Change one relevant assert to av_assert0 while here. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef73ccc2c419a326c… --- libavcodec/h264_refs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 74087ff266..dae8bd278a 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -732,7 +732,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h) for (j = 0; j < MAX_DELAYED_PIC_COUNT; j++) h->last_pocs[j] = INT_MIN; break; - default: assert(0); + default: av_assert0(0); } } @@ -868,6 +868,7 @@ int ff_h264_decode_ref_pic_marking(H264SliceContext *sl, GetBitContext *gb, av_log(logctx, AV_LOG_ERROR, "illegal long ref in memory management control " "operation %d\n", opcode); + sl->nb_mmco = i; return -1; } mmco[i].long_arg = long_arg; @@ -877,6 +878,7 @@ int ff_h264_decode_ref_pic_marking(H264SliceContext *sl, GetBitContext *gb, av_log(logctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode); + sl->nb_mmco = i; return -1; } if (opcode == MMCO_END)

1 0

avformat/mov: improve timecode calculation
by Paul B Mahol 28 Aug '19

28 Aug '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Aug 22 18:14:15 2019 +0200| [428b4aacb1a91a267650de644519882a5f700388] | committer: Paul B Mahol avformat/mov: improve timecode calculation Fixes timecode calculation for NTSC frame rates. Fixes ticket #5978. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=428b4aacb1a91a267… --- libavformat/mov.c | 4 ++-- tests/ref/fate/copy-trac236 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 8a4cdc4b43..675b915906 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2304,8 +2304,8 @@ static int mov_parse_stsd_data(MOVContext *c, AVIOContext *pb, int val; val = AV_RB32(st->codecpar->extradata + 4); tmcd_ctx->tmcd_flags = val; - st->avg_frame_rate.num = st->codecpar->extradata[16]; /* number of frame */ - st->avg_frame_rate.den = 1; + st->avg_frame_rate.num = AV_RB32(st->codecpar->extradata + 8); /* timescale */ + st->avg_frame_rate.den = AV_RB32(st->codecpar->extradata + 12); /* frameDuration */ #if FF_API_LAVF_AVCTX FF_DISABLE_DEPRECATION_WARNINGS st->codec->time_base = av_inv_q(st->avg_frame_rate); diff --git a/tests/ref/fate/copy-trac236 b/tests/ref/fate/copy-trac236 index 2ac05e63e6..1583ae5704 100644 --- a/tests/ref/fate/copy-trac236 +++ b/tests/ref/fate/copy-trac236 @@ -1,4 +1,4 @@ -959a4d78c6c11936e361fc3101a013eb *tests/data/fate/copy-trac236.mov +984a33c6292e3d35e2cfdfbf66d8e82b *tests/data/fate/copy-trac236.mov 630860 tests/data/fate/copy-trac236.mov #tb 0: 100/2997 #media_type 0: video

1 0

avcodec/tiff: add missing break in tiff_decode_tag()
by Paul B Mahol 28 Aug '19

28 Aug '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Aug 28 15:46:40 2019 +0200| [d063f13700aa86365589f49b697e8c42b9cae4ca] | committer: Paul B Mahol avcodec/tiff: add missing break in tiff_decode_tag() > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d063f13700aa86365… --- libavcodec/tiff.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 1f1a1a3698..d02b532a8e 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -958,6 +958,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) switch (tag) { case TIFF_SUBFILE: s->is_thumbnail = (value != 0); + break; case TIFF_WIDTH: s->width = value; break;

1 0

avformat/dhav: always initializer ret
by Paul B Mahol 28 Aug '19

28 Aug '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Aug 28 15:44:36 2019 +0200| [d8410e9cf9dbc36d123113b442d5cda00d04dffb] | committer: Paul B Mahol avformat/dhav: always initializer ret > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d8410e9cf9dbc36d1… --- libavformat/dhav.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dhav.c b/libavformat/dhav.c index dac11df6c4..6a67f981c7 100644 --- a/libavformat/dhav.c +++ b/libavformat/dhav.c @@ -146,7 +146,7 @@ static const uint32_t sample_rates[] = { static int parse_ext(AVFormatContext *s, int length) { DHAVContext *dhav = s->priv_data; - int index, ret; + int index, ret = 0; while (length > 0) { int type = avio_r8(s->pb);

1 0