December 2016 - ffmpeg-cvslog

Fix bug when incrementing initial_prog_date_time when removing segments
by git＠videolan.org 27 Dec '16

27 Dec '16

ffmpeg | branch: master | Jesper Ek <deadbeef84(a)gmail.com> | Tue Dec 27 10:10:44 2016 +0800| [c7c0046efc3a05e52d0a6da4da9f0beae47c0847] | committer: Jesper Ek Fix bug when incrementing initial_prog_date_time when removing segments initial_prog_date_time shouldn't be adjusted when deleting segments from disk, but rather when segments are removed from the playlist. Signed-off-by: Jesper Ek <deadbeef84(a)gmail.com> Signed-off-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7c0046efc3a05e52… --- libavformat/hlsenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index e46e9b4..648e775 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -185,7 +185,6 @@ static int hls_delete_old_segments(HLSContext *hls) { segment = hls->old_segments; while (segment) { playlist_duration -= segment->duration; - hls->initial_prog_date_time += segment->duration; previous_segment = segment; segment = previous_segment->next; if (playlist_duration <= -previous_segment->duration) { @@ -414,6 +413,7 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, double if (hls->max_nb_segments && hls->nb_entries >= hls->max_nb_segments) { en = hls->segments; + hls->initial_prog_date_time += en->duration; hls->segments = en->next; if (en && hls->flags & HLS_DELETE_SEGMENTS && !(hls->flags & HLS_SINGLE_FILE || hls->wrap)) {

1 0

avformat/matroskadec: Fix OOM on long streams
by git＠videolan.org 27 Dec '16

27 Dec '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Dec 26 03:16:01 2016 +0100| [b347ca93412f43fb4593e1381b3b22e2fa20c0de] | committer: Michael Niedermayer avformat/matroskadec: Fix OOM on long streams Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b347ca93412f43fb4… --- libavformat/matroskadec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 58731aa..7e74348 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3234,9 +3234,11 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE && timecode < track->end_timecode) is_keyframe = 0; /* overlapping subtitles are not key frame */ - if (is_keyframe) + if (is_keyframe) { + ff_reduce_index(matroska->ctx, st->index); av_add_index_entry(st, cluster_pos, timecode, 0, 0, AVINDEX_KEYFRAME); + } } if (matroska->skip_to_keyframe &&

1 0

avdevice/decklink_enc: do not reference this after freeing it
by git＠videolan.org 27 Dec '16

27 Dec '16

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Sat Dec 10 13:57:01 2016 +0100| [a7946c8964691a8cac8e8c479d61c9b068d9d76e] | committer: Marton Balint avdevice/decklink_enc: do not reference this after freeing it Fixes Coverity CID 1396863. Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7946c8964691a8ca… --- libavdevice/decklink_enc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp index dc4a24b..ad00224 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -55,7 +55,7 @@ public: virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, LPVOID *ppv) { return E_NOINTERFACE; } virtual ULONG STDMETHODCALLTYPE AddRef(void) { return ++_refs; } - virtual ULONG STDMETHODCALLTYPE Release(void) { if (!--_refs) delete this; return _refs; } + virtual ULONG STDMETHODCALLTYPE Release(void) { if (!--_refs) {delete this; return 0;} return _refs; } struct decklink_ctx *_ctx; AVFrame *_avframe;

1 0

avdevice/decklink_dec: properly initialize no_video variable
by git＠videolan.org 27 Dec '16

27 Dec '16

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Sat Dec 10 13:20:31 2016 +0100| [89a1471a72cb6e3bb58220584866af54092e446d] | committer: Marton Balint avdevice/decklink_dec: properly initialize no_video variable Fixes Coverity CID 1396859. Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89a1471a72cb6e3bb… --- libavdevice/decklink_dec.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index c98c51f..7df841b 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -208,6 +208,7 @@ decklink_input_callback::decklink_input_callback(AVFormatContext *_avctx) : m_re avctx = _avctx; decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; ctx = (struct decklink_ctx *)cctx->ctx; + no_video = 0; initial_audio_pts = initial_video_pts = AV_NOPTS_VALUE; pthread_mutex_init(&m_mutex, NULL); }

1 0

ffmpeg: Check avcodec_parameters_to_context() for failure
by git＠videolan.org 26 Dec '16

26 Dec '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Dec 26 20:25:23 2016 +0100| [11103a493de5f07a61c6f4f1c37a290fdc8942cb] | committer: Michael Niedermayer ffmpeg: Check avcodec_parameters_to_context() for failure Fixes CID1396241 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11103a493de5f07a6… --- ffmpeg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index e4890a4..ec9da3e 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2877,8 +2877,9 @@ static int init_output_stream_streamcopy(OutputStream *ost) av_assert0(ist && !ost->filter); - avcodec_parameters_to_context(ost->enc_ctx, ist->st->codecpar); - ret = av_opt_set_dict(ost->enc_ctx, &ost->encoder_opts); + ret = avcodec_parameters_to_context(ost->enc_ctx, ist->st->codecpar); + if (ret >= 0) + ret = av_opt_set_dict(ost->enc_ctx, &ost->encoder_opts); if (ret < 0) { av_log(NULL, AV_LOG_FATAL, "Error setting up codec context options.\n");

1 0

avcodec/ylc: thread safe initialization is possible with this codec
by git＠videolan.org 26 Dec '16

26 Dec '16

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Dec 26 20:28:40 2016 +0100| [2f347c17d64624bf38b0957a3ddffbe7eeffe82a] | committer: Paul B Mahol avcodec/ylc: thread safe initialization is possible with this codec Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f347c17d64624bf3… --- libavcodec/ylc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/ylc.c b/libavcodec/ylc.c index 3230c56..02162a3 100644 --- a/libavcodec/ylc.c +++ b/libavcodec/ylc.c @@ -494,4 +494,5 @@ AVCodec ff_ylc_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, };

1 0

avcodec/ylc: add frame threading support
by git＠videolan.org 26 Dec '16

26 Dec '16

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Dec 26 20:27:01 2016 +0100| [31bf37cba8ff1e385d38653e0381485c3a8b4c8a] | committer: Paul B Mahol avcodec/ylc: add frame threading support Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=31bf37cba8ff1e385… --- libavcodec/ylc.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/libavcodec/ylc.c b/libavcodec/ylc.c index 81a5774..3230c56 100644 --- a/libavcodec/ylc.c +++ b/libavcodec/ylc.c @@ -31,6 +31,7 @@ #include "get_bits.h" #include "huffyuvdsp.h" #include "internal.h" +#include "thread.h" #include "unary.h" typedef struct YLCContext { @@ -282,6 +283,7 @@ static int decode_frame(AVCodecContext *avctx, int TL[4] = { 128, 128, 128, 128 }; int L[4] = { 128, 128, 128, 128 }; YLCContext *s = avctx->priv_data; + ThreadFrame frame = { .f = data }; const uint8_t *buf = avpkt->data; int ret, x, y, toffset, boffset; AVFrame * const p = data; @@ -303,7 +305,7 @@ static int decode_frame(AVCodecContext *avctx, if (toffset >= boffset || boffset >= avpkt->size) return AVERROR_INVALIDDATA; - if ((ret = ff_get_buffer(avctx, p, 0)) < 0) + if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) return ret; av_fast_malloc(&s->table_bits, &s->table_bits_size, @@ -447,6 +449,24 @@ static int decode_frame(AVCodecContext *avctx, return avpkt->size; } +#if HAVE_THREADS +static int init_thread_copy(AVCodecContext *avctx) +{ + YLCContext *s = avctx->priv_data; + + memset(&s->vlc[0], 0, sizeof(VLC)); + memset(&s->vlc[1], 0, sizeof(VLC)); + memset(&s->vlc[2], 0, sizeof(VLC)); + memset(&s->vlc[3], 0, sizeof(VLC)); + s->table_bits = NULL; + s->table_bits_size = 0; + s->bitstream_bits = NULL; + s->bitstream_bits_size = 0; + + return 0; +} +#endif + static av_cold int decode_end(AVCodecContext *avctx) { YLCContext *s = avctx->priv_data; @@ -470,7 +490,8 @@ AVCodec ff_ylc_decoder = { .id = AV_CODEC_ID_YLC, .priv_data_size = sizeof(YLCContext), .init = decode_init, + .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy), .close = decode_end, .decode = decode_frame, - .capabilities = AV_CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, };

1 0

avcodec/ylc: do not leak memory at uninit
by git＠videolan.org 26 Dec '16

26 Dec '16

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Dec 26 20:18:00 2016 +0100| [341d3ee441474167ac784bb39f2c31f211451707] | committer: Paul B Mahol avcodec/ylc: do not leak memory at uninit Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=341d3ee441474167a… --- libavcodec/ylc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/ylc.c b/libavcodec/ylc.c index 95a5e05..81a5774 100644 --- a/libavcodec/ylc.c +++ b/libavcodec/ylc.c @@ -455,6 +455,10 @@ static av_cold int decode_end(AVCodecContext *avctx) ff_free_vlc(&s->vlc[1]); ff_free_vlc(&s->vlc[2]); ff_free_vlc(&s->vlc[3]); + av_freep(&s->table_bits); + s->table_bits_size = 0; + av_freep(&s->bitstream_bits); + s->bitstream_bits_size = 0; return 0; }

1 0

doc/examples/http_multiclient: Fix resource leak
by git＠videolan.org 26 Dec '16

26 Dec '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Dec 26 17:41:38 2016 +0100| [89d4d7d759a59e8535b267b7f5af757f731da712] | committer: Michael Niedermayer doc/examples/http_multiclient: Fix resource leak Fixes CID1396269 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89d4d7d759a59e853… --- doc/examples/http_multiclient.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/examples/http_multiclient.c b/doc/examples/http_multiclient.c index 7173c4d..e2c2201 100644 --- a/doc/examples/http_multiclient.c +++ b/doc/examples/http_multiclient.c @@ -45,6 +45,7 @@ static void process_client(AVIOContext *client, const char *in_uri) // may return empty string. if (resource && strlen(resource)) break; + av_freep(&resource); } if (ret < 0) goto end; @@ -93,6 +94,7 @@ end: avio_close(client); fprintf(stderr, "Closing input\n"); avio_close(input); + av_freep(&resource); } int main(int argc, char **argv)

1 0

flv demuxer supports live rtmp inputs but there is no any info about it in the docs.
by git＠videolan.org 26 Dec '16

26 Dec '16

ffmpeg | branch: master | Bela Bodecs <bodecsb(a)vivanet.hu> | Sat Dec 24 00:21:23 2016 +0100| [ce5c7260df2d66dd26a6fe9709cef66aa7139162] | committer: Michael Niedermayer flv demuxer supports live rtmp inputs but there is no any info about it in the docs. Signed-off-by: Bela Bodecs <bodecsb(a)vivanet.hu> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ce5c7260df2d66dd2… --- doc/demuxers.texi | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/demuxers.texi b/doc/demuxers.texi index 2934a1c..c12c07e 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -243,11 +243,17 @@ file subdir/file-2.wav @end example @end itemize -@section flv +@section flv, live_flv Adobe Flash Video Format demuxer. -This demuxer is used to demux FLV files and RTMP network streams. +This demuxer is used to demux FLV files and RTMP network streams. In case of live network streams, if you force format, you may use live_flv option instead of flv to survive timestamp discontinuities. + +@example +ffmpeg -f flv -i myfile.flv ... +ffmpeg -f live_flv -i rtmp://<any.server>/anything/key .... +@end example + @table @option @item -flv_metadata @var{bool}

1 0