[FFmpeg-cvslog] Add IRC nicknames
ffmpeg | branch: master | Tomas Härdin | Sat Apr 7 12:18:00 2018 +0200| [10ed9f2b12936a51047124358dffcee7dab8f421] | committer: Tomas Härdin Add IRC nicknames > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=10ed9f2b12936a51047124358dffcee7dab8f421 --- MAINTAINERS | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index ca3f4e5a2f..2172901fe7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -574,8 +574,11 @@ Releases If you want to maintain an older release, please contact us -GnuPG Fingerprints of maintainers and contributors -== +GnuPG Fingerprints and IRC nicknames of maintainers and contributors + + +IRC nicknames are in parentheses. These apply +to the IRC channels listed on the website. Alexander Strasser1C96 78B7 83CB 8AA7 9AF5 D1EB A7D8 A57B A876 E58F Anssi Hannula 1A92 FF42 2DD9 8D2E 8AF7 65A9 4278 C520 513D F3CB @@ -593,7 +596,7 @@ Jaikrishnan Menon 61A1 F09F 01C9 2D45 78E1 C862 25DC 8831 AF70 D368 James Almer 7751 2E8C FD94 A169 57E6 9A7A 1463 01AD 7376 59E0 Jean Delvare 7CA6 9F44 60F1 BDC4 1FD2 C858 A552 6B9B B3CD 4E6A Loren Merritt ABD9 08F4 C920 3F65 D8BE 35D7 1540 DAA7 060F 56DE -Lou Logan 7D68 DC73 CBEF EABB 671A B6CF 621C 2E28 82F8 DC3A +Lou Logan (llogan)7D68 DC73 CBEF EABB 671A B6CF 621C 2E28 82F8 DC3A Michael Niedermayer 9FF2 128B 147E F673 0BAD F133 611E C787 040B 0FAB Nicolas George24CE 01CE 9ACC 5CEB 74D8 8D9D B063 D997 36E5 4C93 Nikolay Aleksandrov 8978 1D8C FB71 588E 4B27 EAA8 C4F0 B5FC E011 13B1 @@ -610,5 +613,5 @@ Steinar H. Gunderson C2E9 004F F028 C18E 4EAD DB83 7F61 7561 7797 8F76 Stephan Hilb 4F38 0B3A 5F39 B99B F505 E562 8D5C 5554 4E17 8863 Tiancheng "Timothy" Gu9456 AFC0 814A 8139 E994 8351 7FE6 B095 B582 B0D4 Tim Nicholson 38CF DB09 3ED0 F607 8B67 6CED 0C0B FC44 8B0B FC83 -Tomas Härdin A79D 4E3D F38F 763F 91F5 8B33 A01E 8AE0 41BB 2551 +Tomas Härdin (thardin)A79D 4E3D F38F 763F 91F5 8B33 A01E 8AE0 41BB 2551 Wei Gao 4269 7741 857A 0E60 9EC5 08D2 4744 4EFA 62C1 87B9 ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/vf_amplify: check if array is availabe before using it
ffmpeg | branch: master | Paul B Mahol | Mon May 14 16:00:00
2018 +0200| [e3a697eda3b7c3e786a8e7dba9d4627c922f9aad] | committer: Paul B Mahol
avfilter/vf_amplify: check if array is availabe before using it
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e3a697eda3b7c3e786a8e7dba9d4627c922f9aad
---
libavfilter/vf_amplify.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavfilter/vf_amplify.c b/libavfilter/vf_amplify.c
index 7b58db065d..d1e105ef17 100644
--- a/libavfilter/vf_amplify.c
+++ b/libavfilter/vf_amplify.c
@@ -227,8 +227,10 @@ static av_cold void uninit(AVFilterContext *ctx)
AmplifyContext *s = ctx->priv;
int i;
-for (i = 0; i < s->nb_frames; i++)
-av_frame_free(&s->frames[i]);
+if (s->frames) {
+for (i = 0; i < s->nb_frames; i++)
+ av_frame_free(&s->frames[i]);
+}
av_freep(&s->frames);
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/vf_srcnn: use function to get number of threads
ffmpeg | branch: master | Paul B Mahol | Mon May 14 16:02:00
2018 +0200| [80b474875e72897b3f7eb2f0edbeaa4b2087da61] | committer: Paul B Mahol
avfilter/vf_srcnn: use function to get number of threads
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=80b474875e72897b3f7eb2f0edbeaa4b2087da61
---
libavfilter/vf_srcnn.c | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/libavfilter/vf_srcnn.c b/libavfilter/vf_srcnn.c
index edffebb278..db1c40cf1e 100644
--- a/libavfilter/vf_srcnn.c
+++ b/libavfilter/vf_srcnn.c
@@ -337,6 +337,7 @@ static int filter_frame(AVFilterLink* inlink, AVFrame* in)
AVFrame* out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
ThreadData td;
ConvThreadData ctd;
+int nb_threads;
if (!out){
av_log(context, AV_LOG_ERROR, "could not allocate memory for output
frame\n");
@@ -351,20 +352,21 @@ static int filter_frame(AVFilterLink* inlink, AVFrame* in)
td.height = ctd.height = out->height;
td.width = ctd.width = out->width;
-context->internal->execute(context, uint8_to_double, &td, NULL,
FFMIN(td.height, context->graph->nb_threads));
+nb_threads = ff_filter_get_nb_threads(context);
+context->internal->execute(context, uint8_to_double, &td, NULL,
FFMIN(td.height, nb_threads));
ctd.conv = &srcnn_context->conv1;
ctd.input = srcnn_context->input_output_buf;
ctd.output = srcnn_context->conv1_buf;
-context->internal->execute(context, convolve, &ctd, NULL,
FFMIN(ctd.height, context->graph->nb_threads));
+context->internal->execute(context, convolve, &ctd, NULL,
FFMIN(ctd.height, nb_threads));
ctd.conv = &srcnn_context->conv2;
ctd.input = srcnn_context->conv1_buf;
ctd.output = srcnn_context->conv2_buf;
-context->internal->execute(context, convolve, &ctd, NULL,
FFMIN(ctd.height, context->graph->nb_threads));
+context->internal->execute(context, convolve, &ctd, NULL,
FFMIN(ctd.height, nb_threads));
ctd.conv = &srcnn_context->conv3;
ctd.input = srcnn_context->conv2_buf;
ctd.output = srcnn_context->input_output_buf;
-context->internal->execute(context, convolve, &ctd, NULL,
FFMIN(ctd.height, context->graph->nb_threads));
-context->internal->execute(context, double_to_uint8, &td, NULL,
FFMIN(td.height, context->graph->nb_threads));
+context->internal->execute(context, convolve, &ctd, NULL,
FFMIN(ctd.height, nb_threads));
+context->internal->execute(context, double_to_uint8, &td, NULL,
FFMIN(td.height, nb_threads));
return ff_filter_frame(outlink, out);
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: add pkg-config check for libmysofa
ffmpeg | branch: master | Reino Wijnsma | Mon May 7
17:59:43 2018 +0200| [1548d2a5a547dd043726c102687b184c7ac08575] | committer:
Paul B Mahol
configure: add pkg-config check for libmysofa
This does require libmysofa with today's latest commit
(https://github.com/hoene/libmysofa/commit/08f243d1ec35f6f794aedeb4b187d9f9353bdbc1).
They already had a pkg-config file, but the dependencies weren't setup right.
Until now.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1548d2a5a547dd043726c102687b184c7ac08575
---
configure | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 451d1937b7..6a9d51698d 100755
--- a/configure
+++ b/configure
@@ -6011,7 +6011,8 @@ enabled libmfx&& { check_pkg_config libmfx
libmfx "mfx/mfxvideo.h" M
{ require libmfx "mfx/mfxvideo.h" MFXInit
"-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } }
enabled libmodplug&& require_pkg_config libmodplug libmodplug
libmodplug/modplug.h ModPlug_Load
enabled libmp3lame&& require "libmp3lame >= 3.98.3" lame/lame.h
lame_set_VBR_quality -lmp3lame $libm_extralibs
-enabled libmysofa && require libmysofa "mysofa.h" mysofa_load -lmysofa
$zlib_extralibs
+enabled libmysofa && { check_pkg_config libmysofa libmysofa mysofa.h
mysofa_load ||
+ require libmysofa mysofa.h mysofa_load -lmysofa
$zlib_extralibs; }
enabled libnpp&& { check_lib libnpp npp.h nppGetLibVersion -lnppig
-lnppicc -lnppc ||
check_lib libnpp npp.h nppGetLibVersion -lnppi
-lnppc ||
die "ERROR: libnpp not found"; }
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/vf_lut2: add timeline support to tlut2 filter
ffmpeg | branch: master | Paul B Mahol | Mon May 14 18:26:16
2018 +0200| [2bde38c0ab6c06aca6a5460055c5b1e1296732f3] | committer: Paul B Mahol
avfilter/vf_lut2: add timeline support to tlut2 filter
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2bde38c0ab6c06aca6a5460055c5b1e1296732f3
---
libavfilter/vf_lut2.c | 27 ++-
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/libavfilter/vf_lut2.c b/libavfilter/vf_lut2.c
index 1385cba9b1..66c481e570 100644
--- a/libavfilter/vf_lut2.c
+++ b/libavfilter/vf_lut2.c
@@ -401,18 +401,26 @@ static av_cold int init(AVFilterContext *ctx)
static int tlut2_filter_frame(AVFilterLink *inlink, AVFrame *frame)
{
-LUT2Context *s = inlink->dst->priv;
-AVFilterLink *outlink = inlink->dst->outputs[0];
+AVFilterContext *ctx = inlink->dst;
+LUT2Context *s = ctx->priv;
+AVFilterLink *outlink = ctx->outputs[0];
if (s->prev_frame) {
-AVFrame *out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
-if (!out) {
-av_frame_free(&s->prev_frame);
-s->prev_frame = frame;
-return AVERROR(ENOMEM);
+AVFrame *out;
+
+if (ctx->is_disabled) {
+out = av_frame_clone(frame);
+} else {
+out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
+if (!out) {
+av_frame_free(&s->prev_frame);
+s->prev_frame = frame;
+return AVERROR(ENOMEM);
+}
+
+av_frame_copy_props(out, frame);
+s->lut2(s, out, frame, s->prev_frame);
}
-av_frame_copy_props(out, frame);
-s->lut2(s, out, frame, s->prev_frame);
av_frame_free(&s->prev_frame);
s->prev_frame = frame;
return ff_filter_frame(outlink, out);
@@ -454,6 +462,7 @@ AVFilter ff_vf_tlut2 = {
.uninit= uninit,
.inputs= tlut2_inputs,
.outputs = tlut2_outputs,
+.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL,
};
#endif
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/vf_blend: add timeline support to tblend filter
ffmpeg | branch: master | Paul B Mahol | Mon May 14 17:58:27
2018 +0200| [a27cab9eca631d9b27fafb4efadde99bae33383b] | committer: Paul B Mahol
avfilter/vf_blend: add timeline support to tblend filter
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a27cab9eca631d9b27fafb4efadde99bae33383b
---
libavfilter/vf_blend.c | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c
index 70c37c75da..e83a0db640 100644
--- a/libavfilter/vf_blend.c
+++ b/libavfilter/vf_blend.c
@@ -626,11 +626,17 @@ AVFilter ff_vf_blend = {
static int tblend_filter_frame(AVFilterLink *inlink, AVFrame *frame)
{
-BlendContext *s = inlink->dst->priv;
-AVFilterLink *outlink = inlink->dst->outputs[0];
+AVFilterContext *ctx = inlink->dst;
+BlendContext *s = ctx->priv;
+AVFilterLink *outlink = ctx->outputs[0];
if (s->prev_frame) {
-AVFrame *out = blend_frame(inlink->dst, frame, s->prev_frame);
+AVFrame *out;
+
+if (ctx->is_disabled)
+out = av_frame_clone(frame);
+else
+out = blend_frame(ctx, frame, s->prev_frame);
av_frame_free(&s->prev_frame);
s->prev_frame = frame;
return ff_filter_frame(outlink, out);
@@ -674,7 +680,7 @@ AVFilter ff_vf_tblend = {
.uninit= uninit,
.inputs= tblend_inputs,
.outputs = tblend_outputs,
-.flags = AVFILTER_FLAG_SLICE_THREADS,
+.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL |
AVFILTER_FLAG_SLICE_THREADS,
};
#endif
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/mpegts: initialize section_buf to fix valgrind test failure
ffmpeg | branch: master | Aman Gupta | Mon May 14 10:24:44 2018 -0700| [42a03e77000692ad6de032b8cf684e1d6ec73790] | committer: Aman Gupta avformat/mpegts: initialize section_buf to fix valgrind test failure http://fate.ffmpeg.org/report.cgi?slot=x86_64-archlinux-gcc-valgrind&time=20180513001958 Signed-off-by: Aman Gupta > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42a03e77000692ad6de032b8cf684e1d6ec73790 --- libavformat/mpegts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 9c09819531..27b1c30a44 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -490,7 +490,7 @@ static MpegTSFilter *mpegts_open_section_filter(MpegTSContext *ts, sec = &filter->u.section_filter; sec->section_cb = section_cb; sec->opaque = opaque; -sec->section_buf = av_malloc(MAX_SECTION_SIZE); +sec->section_buf = av_mallocz(MAX_SECTION_SIZE); sec->check_crc = check_crc; sec->last_ver= -1; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: Mention the dash demuxer in the libxml2 help text.
ffmpeg | branch: master | Carl Eugen Hoyos | Mon May 14 21:00:26 2018 +0200| [20b88076223b88f99e44b6ac5d68749c8d6998ca] | committer: Carl Eugen Hoyos configure: Mention the dash demuxer in the libxml2 help text. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20b88076223b88f99e44b6ac5d68749c8d6998ca --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 6a9d51698d..1f7d0140e3 100755 --- a/configure +++ b/configure @@ -282,7 +282,8 @@ External library support: --enable-libxcb-shapeenable X11 grabbing shape rendering [autodetect] --enable-libxvid enable Xvid encoding via xvidcore, native MPEG-4/Xvid encoder exists [no] - --enable-libxml2 enable XML parsing using the C library libxml2 [no] + --enable-libxml2 enable XML parsing using the C library libxml2, needed + for dash demuxing support [no] --enable-libzimg enable z.lib, needed for zscale filter [no] --enable-libzmq enable message passing via libzmq [no] --enable-libzvbi enable teletext support via libzvbi [no] ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/h2645_parse: skip NALUs with no content after stripping all the trailing zeros
ffmpeg | branch: master | James Almer | Mon May 14 18:09:32
2018 -0300| [9a09f4c54ab829811c2dd041cfb7196000590b78] | committer: James Almer
avcodec/h2645_parse: skip NALUs with no content after stripping all the
trailing zeros
The GetBitContext is effectively empty in them.
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9a09f4c54ab829811c2dd041cfb7196000590b78
---
libavcodec/h2645_parse.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c
index dbf2435677..d436d65f48 100644
--- a/libavcodec/h2645_parse.c
+++ b/libavcodec/h2645_parse.c
@@ -371,7 +371,7 @@ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t
*buf, int length,
ret = hevc_parse_nal_header(nal, logctx);
else
ret = h264_parse_nal_header(nal, logctx);
-if (ret <= 0 || nal->size <= 0) {
+if (ret <= 0 || nal->size <= 0 || nal->size_bits <= 0) {
if (ret < 0) {
av_log(logctx, AV_LOG_ERROR, "Invalid NAL unit %d,
skipping.\n",
nal->type);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/dashenc: configuring container format options
ffmpeg | branch: master | Vishwanath Dixit | Mon May 7
15:46:02 2018 +0530| [e3518821c95d3a90498e93e53dcc886b9d082ccf] | committer:
Karthick Jeyapal
avformat/dashenc: configuring container format options
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e3518821c95d3a90498e93e53dcc886b9d082ccf
---
doc/muxers.texi | 4
libavformat/dashenc.c | 7 +++
2 files changed, 11 insertions(+)
diff --git a/doc/muxers.texi b/doc/muxers.texi
index 57948cfb9a..59e20bf426 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -284,6 +284,10 @@ corrects that index value.
Typically this logic is needed in live streaming use cases. The network
bandwidth
fluctuations are common during long run streaming. Each fluctuation can cause
the segment indexes fall behind the expected real time position.
+@item -format_options @var{options_list}
+Set container format (mp4/webm) options using a @code{:} separated list of
+key=value parameters. Values containing @code{:} special characters must be
+escaped.
@end table
@anchor{framecrc}
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index 1dd633365d..e27b61c096 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -125,6 +125,7 @@ typedef struct DASHContext {
int streaming;
int64_t timeout;
int index_correction;
+char *format_options_str;
} DASHContext;
static struct codec_string {
@@ -1017,6 +1018,11 @@ static int dash_init(AVFormatContext *s)
av_dict_free(&opts);
os->init_start_pos = 0;
+if (c->format_options_str) {
+ret = av_dict_parse_string(&opts, c->format_options_str, "=", ":",
0);
+if (ret < 0)
+return ret;
+}
if (!strcmp(os->format_name, "mp4")) {
if (c->streaming)
av_dict_set(&opts, "movflags",
"frag_every_frame+dash+delay_moov", 0);
@@ -1538,6 +1544,7 @@ static const AVOption options[] = {
{ "streaming", "Enable/Disable streaming mode of output. Each frame will
be moof fragment", OFFSET(streaming), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E },
{ "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},
{ NULL },
};
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
