[FFmpeg-cvslog] avformat/teeproto: Fix memset sizeof
ffmpeg | branch: master | Michael Niedermayer | Fri Jul 22 10:34:14 2016 +0200| [e83a01def3ad7ca8a7344f4774acdbe8adbec37d] | committer: Michael Niedermayer avformat/teeproto: Fix memset sizeof Found-by: James Almer Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e83a01def3ad7ca8a7344f4774acdbe8adbec37d --- libavformat/teeproto.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/teeproto.c b/libavformat/teeproto.c index 62055de..12d5423 100644 --- a/libavformat/teeproto.c +++ b/libavformat/teeproto.c @@ -102,7 +102,7 @@ static int tee_open(URLContext *h, const char *filename, int flags) goto fail; } c->child = tmp; -memset(&c->child[c->child_count], 0, sizeof(&c->child[c->child_count])); +memset(&c->child[c->child_count], 0, sizeof(c->child[c->child_count])); ret = ffurl_open_whitelist(&c->child[c->child_count].url_context, child_name, flags, &h->interrupt_callback, /*AVDictionary **options*/NULL, ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] fate: add test for extrastereo filter
ffmpeg | branch: master | Petru Rares Sincraian | Thu Jul 21 07:21:01 2016 +0200| [fa393e30614b085f2b0197fa6f3914f0cf3d3a1c] | committer: Michael Niedermayer fate: add test for extrastereo filter Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa393e30614b085f2b0197fa6f3914f0cf3d3a1c --- tests/fate/filter-audio.mak |5 + tests/ref/fate/filter-extrastereo | 25 + 2 files changed, 30 insertions(+) diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index bdf6720..43d8ff1 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -109,6 +109,11 @@ fate-filter-earwax: tests/data/asynth-44100-2.wav fate-filter-earwax: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav fate-filter-earwax: CMD = framecrc -i $(SRC) -aframes 20 -af earwax +FATE_AFILTER-$(call FILTERDEMDECENCMUX, EXTRASTEREO, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-extrastereo +fate-filter-extrastereo: tests/data/asynth-44100-2.wav +fate-filter-extrastereo: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav +fate-filter-extrastereo: CMD = framecrc -i $(SRC) -aframes 20 -af extrastereo=m=2 + tests/data/hls-list.m3u8: TAG = GEN tests/data/hls-list.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ diff --git a/tests/ref/fate/filter-extrastereo b/tests/ref/fate/filter-extrastereo new file mode 100644 index 000..e43de2d --- /dev/null +++ b/tests/ref/fate/filter-extrastereo @@ -0,0 +1,25 @@ +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 44100 +#channel_layout 0: 3 +0, 0, 0, 1024, 4096, 0x29e3eecf +0, 1024, 1024, 1024, 4096, 0x18390b96 +0, 2048, 2048, 1024, 4096, 0xc477fa99 +0, 3072, 3072, 1024, 4096, 0x3bc0f14f +0, 4096, 4096, 1024, 4096, 0x2379ed91 +0, 5120, 5120, 1024, 4096, 0xfd6a0070 +0, 6144, 6144, 1024, 4096, 0x0b01f4cf +0, 7168, 7168, 1024, 4096, 0x6716fd93 +0, 8192, 8192, 1024, 4096, 0x1840f25b +0, 9216, 9216, 1024, 4096, 0x9c1ffaf1 +0, 10240, 10240, 1024, 4096, 0xcbedefaf +0, 11264, 11264, 1024, 4096, 0x3e050390 +0, 12288, 12288, 1024, 4096, 0xb30e0090 +0, 13312, 13312, 1024, 4096, 0x26b8f75b +0, 14336, 14336, 1024, 4096, 0xd706e311 +0, 15360, 15360, 1024, 4096, 0x0c480138 +0, 16384, 16384, 1024, 4096, 0x6c9a0216 +0, 17408, 17408, 1024, 4096, 0x7abce54f +0, 18432, 18432, 1024, 4096, 0xda45f63f +0, 19456, 19456, 1024, 4096, 0x50d5ff87 ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc/muxers: add hls_flags option description
ffmpeg | branch: master | Steven Liu | Mon Jul 18
20:05:35 2016 +0800| [6f0746783124ddc403484b6d29c7fee5b3194d0f] | committer:
Michael Niedermayer
doc/muxers: add hls_flags option description
Signed-off-by: Steven Liu
Reviewed-by: Moritz Barsnick
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f0746783124ddc403484b6d29c7fee5b3194d0f
---
doc/muxers.texi | 11 +++
1 file changed, 11 insertions(+)
diff --git a/doc/muxers.texi b/doc/muxers.texi
index 1b99c7e..66539c1 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -495,6 +495,17 @@ Will produce the playlist, @file{out.m3u8}, and a single
segment file,
Segment files removed from the playlist are deleted after a period of time
equal to the duration of the segment plus the duration of the playlist.
+@item hls_flags round_durations
+Round the duration info in the playlist file segment info to integer
+values, instead of using floating point.
+
+@item hls_flags discont_starts
+Add the @code{#EXT-X-DISCONTINUITY} tag to the playlist, before the
+first segment's information.
+
+@item hls_flags omit_endlist
+Do not append the @code{EXT-X-ENDLIST} tag at the end of the playlist.
+
@item hls_flags split_by_time
If this flags is set, allow segments to start on frames other than keyframes.
This improves behavior on some players when the time between keyframes is
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc/muxers: improve hlsenc description
ffmpeg | branch: master | Steven Liu | Mon Jul 18
20:10:25 2016 +0800| [41ad6d193adee37bc2e805d8a03e94ddc883fb08] | committer:
Michael Niedermayer
doc/muxers: improve hlsenc description
Signed-off-by: Moritz Barsnick
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=41ad6d193adee37bc2e805d8a03e94ddc883fb08
---
doc/muxers.texi | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/muxers.texi b/doc/muxers.texi
index 66539c1..5873269 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -396,8 +396,8 @@ which can be cyclic, for example if the @option{wrap}
option is
specified.
@item hls_segment_filename @var{filename}
-Set the segment filename. Unless hls_flags single_file is set @var{filename}
-is used as a string format with the segment number:
+Set the segment filename. Unless @code{hls_flags single_file} is set,
+@var{filename} is used as a string format with the segment number:
@example
ffmpeg in.nut -hls_segment_filename 'file%03d.ts' out.m3u8
@end example
@@ -507,10 +507,10 @@ first segment's information.
Do not append the @code{EXT-X-ENDLIST} tag at the end of the playlist.
@item hls_flags split_by_time
-If this flags is set, allow segments to start on frames other than keyframes.
-This improves behavior on some players when the time between keyframes is
-inconsistent, but may make things worse on others, and can cause some oddities
-during seeking. This flag should be used with hls_time option.
+Allow segments to start on frames other than keyframes. This improves
+behavior on some players when the time between keyframes is inconsistent,
+but may make things worse on others, and can cause some oddities during
+seeking. This flag should be used with the @code{hls_time} option.
@item hls_playlist_type event
Emit @code{#EXT-X-PLAYLIST-TYPE:EVENT} in the m3u8 header. Forces
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] libx264: Increase x264 opts character limit to 4096
ffmpeg | branch: master | Sasi Inguva | Thu
Jul 21 18:52:41 2016 -0700| [282477bf4534439ecb06f14d46446a4f1ab82284] |
committer: Michael Niedermayer
libx264: Increase x264 opts character limit to 4096
Signed-off-by: Sasi Inguva
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=282477bf4534439ecb06f14d46446a4f1ab82284
---
libavcodec/libx264.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index c8f2380..b730c91 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -777,8 +777,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
if(x4->x264opts){
const char *p= x4->x264opts;
while(p){
-char param[256]={0}, val[256]={0};
-if(sscanf(p, "%255[^:=]=%255[^:]", param, val) == 1){
+char param[4096]={0}, val[4096]={0};
+if(sscanf(p, "%4095[^:=]=%4095[^:]", param, val) == 1){
OPT_STR(param, "1");
}else
OPT_STR(param, val);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/mpeg4_unpack_bframes_bsf: Copy packet props
ffmpeg | branch: master | Jan Sebechlebsky | Fri
Jul 22 17:59:29 2016 +0200| [8c997b3d3d1b60288ef9cd38cf1e709245a9ae64] |
committer: Michael Niedermayer
avcodec/mpeg4_unpack_bframes_bsf: Copy packet props
mpeg4_unpack_bframes_bsf bitstream filters constructs
resulting packet using av_packet_from_data() function.
This function however modifies only buffer (data) and leaves
other fields untouched, so the content of other fields
of the output packet is undefined.
It is working with old BSF API, since old API filters
just data and the packet fields are copied in
av_apply_bitstream_filters from input packet.
This change fixes the behaviour for the new BSF API.
Signed-off-by: Jan Sebechlebsky
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8c997b3d3d1b60288ef9cd38cf1e709245a9ae64
---
libavcodec/mpeg4_unpack_bframes_bsf.c |6 ++
1 file changed, 6 insertions(+)
diff --git a/libavcodec/mpeg4_unpack_bframes_bsf.c
b/libavcodec/mpeg4_unpack_bframes_bsf.c
index 0615621..aee8ccb 100644
--- a/libavcodec/mpeg4_unpack_bframes_bsf.c
+++ b/libavcodec/mpeg4_unpack_bframes_bsf.c
@@ -120,6 +120,12 @@ static int mpeg4_unpack_bframes_filter(AVBSFContext *ctx,
AVPacket *out)
if (nb_vop == 1 && s->b_frame_buf) {
/* use frame from BSFContext */
+ret = av_packet_copy_props(out, in);
+if (ret < 0) {
+av_packet_free(&in);
+return ret;
+}
+
av_packet_from_data(out, s->b_frame_buf, s->b_frame_buf_size);
if (in->size <= MAX_NVOP_SIZE) {
/* N-VOP */
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/mpeg4_unpack_bframes_bsf: Check av_packet_from_data() return value
ffmpeg | branch: master | Jan Sebechlebsky | Fri
Jul 22 17:59:30 2016 +0200| [1c46e53dcc685593eaa0d730f263ec95c16a5da8] |
committer: Michael Niedermayer
avcodec/mpeg4_unpack_bframes_bsf: Check av_packet_from_data() return value
Signed-off-by: Jan Sebechlebsky
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c46e53dcc685593eaa0d730f263ec95c16a5da8
---
libavcodec/mpeg4_unpack_bframes_bsf.c |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavcodec/mpeg4_unpack_bframes_bsf.c
b/libavcodec/mpeg4_unpack_bframes_bsf.c
index aee8ccb..e227f58 100644
--- a/libavcodec/mpeg4_unpack_bframes_bsf.c
+++ b/libavcodec/mpeg4_unpack_bframes_bsf.c
@@ -126,7 +126,11 @@ static int mpeg4_unpack_bframes_filter(AVBSFContext *ctx,
AVPacket *out)
return ret;
}
-av_packet_from_data(out, s->b_frame_buf, s->b_frame_buf_size);
+ret = av_packet_from_data(out, s->b_frame_buf, s->b_frame_buf_size);
+if (ret < 0) {
+av_packet_free(&in);
+return ret;
+}
if (in->size <= MAX_NVOP_SIZE) {
/* N-VOP */
av_log(ctx, AV_LOG_DEBUG, "Skipping N-VOP.\n");
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavc/intrax8: Use correct printf specifier for size_t on Windows.
ffmpeg | branch: master | Carl Eugen Hoyos | Fri Jul 22
19:23:01 2016 +0200| [db8e8c97311ab2fe65cd54acee8731f8b126302b] | committer:
Carl Eugen Hoyos
lavc/intrax8: Use correct printf specifier for size_t on Windows.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db8e8c97311ab2fe65cd54acee8731f8b126302b
---
libavcodec/intrax8.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c
index 1e881fc..5e1233b 100644
--- a/libavcodec/intrax8.c
+++ b/libavcodec/intrax8.c
@@ -116,7 +116,7 @@ static av_cold int x8_vlc_init(void)
#undef init_or_vlc
if (offset != sizeof(table) / sizeof(VLC_TYPE) / 2) {
-av_log(NULL, AV_LOG_ERROR, "table size %zd does not match needed %i\n",
+av_log(NULL, AV_LOG_ERROR, "table size %"SIZE_SPECIFIER" does not
match needed %i\n",
sizeof(table) / sizeof(VLC_TYPE) / 2, offset);
return AVERROR_INVALIDDATA;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] ffmpeg.c: copy video profile when using stream_copy
ffmpeg | branch: master | Mark Reid | Fri Jul 22 13:30:14
2016 -0700| [0a088dea3d3335dee885c6486424337649ca2dba] | committer: Michael
Niedermayer
ffmpeg.c: copy video profile when using stream_copy
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a088dea3d3335dee885c6486424337649ca2dba
---
ffmpeg.c |1 +
1 file changed, 1 insertion(+)
diff --git a/ffmpeg.c b/ffmpeg.c
index b29be1e..1367920 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3019,6 +3019,7 @@ static int transcode_init(void)
enc_ctx->width = dec_ctx->width;
enc_ctx->height = dec_ctx->height;
enc_ctx->has_b_frames = dec_ctx->has_b_frames;
+enc_ctx->profile= dec_ctx->profile;
if (ost->frame_aspect_ratio.num) { // overridden by the
-aspect cli option
sar =
av_mul_q(ost->frame_aspect_ratio,
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
