Re: [FFmpeg-devel] [PATCH]lavf/movenc: Allow to disable writing the timecode track
2016-09-25 21:47 GMT+02:00 Clément Bœsch :
>> +{ "write_tmcd", "force or disable writing tmcd",
>> offsetof(MOVMuxContext, write_tmcd), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 1,
>> AV_OPT_FLAG_ENCODING_PARAM},
>
> AV_OPT_TYPE_BOOL
Applied with that change.
[...]
> Didn't test nor looked in depth, but OK if it disable timecode in
> MP4 by default. Timecode is only (badly) "standardized" in MOV,
> so we shouldn't write such track in MP4.
Independent patch sent, this changes (requested) behaviour.
Thank you, Carl Eugen
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH]lavf/movenc: Only write timecode track for mov by default
Hi!
As requested by Clément, no opinion here.
Please comment, Carl Eugen
From 233aaff6511c3b105a7ac2dad2d55d03455df153 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos
Date: Mon, 26 Sep 2016 08:52:36 +0200
Subject: [PATCH] lavf/movenc: Only write timecode track for mov by default.
---
Changelog|1 +
doc/muxers.texi |2 +-
libavformat/movenc.c |2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Changelog b/Changelog
index 4e4b4bf..7e99767 100644
--- a/Changelog
+++ b/Changelog
@@ -35,6 +35,7 @@ version :
- sdl2 output device
- sdl2 support for ffplay
- sdl1 output device and sdl1 support removed
+- Write timecode track only for mov output by default
version 3.1:
diff --git a/doc/muxers.texi b/doc/muxers.texi
index c8a056f..87dccf5 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -886,7 +886,7 @@ circumstances (avoiding basing track fragment location
calculations
on the implicit end of the previous track fragment).
@item -write_tmcd
Specify @code{on} to force writing a timecode track, @code{off} to disable it
-and @code{auto} to write a timecode track only for mov and mp4 output
(default).
+and @code{auto} to write a timecode track only for mov output (default).
@end table
@subsection Example
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 449d0b5..83840a6 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -5540,7 +5540,7 @@ static int mov_write_header(AVFormatContext *s)
}
}
-if ( mov->write_tmcd == -1 && (mov->mode == MODE_MOV || mov->mode ==
MODE_MP4)
+if ( mov->write_tmcd == -1 && mov->mode == MODE_MOV
|| mov->write_tmcd == 1) {
tmcd_track = mov->nb_streams;
--
1.7.10.4
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 1/2] lavf/mxfdec: add support for all of the picture size and offset fields
On Sep 26, 2016 09:29, "Carl Eugen Hoyos" wrote: > > 2016-09-26 1:52 GMT+02:00 Jan Ekström : > > If this fixes anything (I am not sure I understand: Are you changing a > type which introduces a possible undefined behaviour, so you add an > additional check at the same time?) it should be part of above new > patch imo (or an independent patch). > The specification notes that width and height are uint32 in MXF. Thus the old type of "int" was incorrect. The width and height of codecpar are "int" so by fixing the type it can overflow (you'd get negative values), and thus have to be capped. The old code would have had thus an overflow happen naturally in the case of a large enough unsigned integer as the value would have been read into an int. Jan ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 1/2] lavf/mxfdec: add support for all of the picture size and offset fields
2016-09-26 1:52 GMT+02:00 Jan Ekström :
> * Renames the `width` and `height` entries to `stored_{width,height}`
> according to the specification's naming.
This should be a separate patch. (Although I wonder how useful it is:
Are you planning to add yourself as mxf maintainer? This would be
very welcome.)
> * Switches the data type of widths and heights to uint32_t according
> to specification, adds additional checks to make sure we don't
> overflow INT_MAX as codecpar->{width,height} are signed integers.
If this fixes anything (I am not sure I understand: Are you changing a
type which introduces a possible undefined behaviour, so you add an
additional check at the same time?) it should be part of above new
patch imo (or an independent patch).
> * Adds and parses the sampled and display width and height entries.
The rest should be added together with the side data injection.
Carl Eugen
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH]lavf/utils: Do not overflow in update_initial_timestamps().
2016-09-25 23:55 GMT+02:00 Michael Niedermayer : >> > probably ok >> > it might be ultimately easier to reject demuxer output that has >> > timestamps close to INT64 MAX/MIN instead of protecting all >> > computations one by one though >> >> I don't disagree but I am probably unable to improve the patch. >> Do you want me to apply? > > ive posted an alternative Looks much simpler, thank you! Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] lavf/mpegtsenc: fix autobsf when the first NAL is 0x1 bytes
On Sun, Sep 25, 2016 at 02:43:47PM -0500, Rodger Combs wrote: > --- > libavformat/mpegtsenc.c | 8 ++-- > 1 file changed, 6 insertions(+), 2 deletions(-) probably ok or rather ive no better idea either thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Rewriting code that is poorly written but fully understood is good. Rewriting code that one doesnt understand is a sign that one is less smart then the original author, trying to rewrite it will not make it better. signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] Add YUV420P10 to vaapi hardware decode - permits hardware decoding of HEVC Main 10 on AMD RX 480
On Tue, Aug 09, 2016 at 05:15:30PM +0200, Jean-Yves Simon wrote: > --- > libavcodec/hevc.c | 3 +++ > 1 file changed, 3 insertions(+) applied thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB While the State exists there can be no freedom; when there is freedom there will be no State. -- Vladimir Lenin signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 2/2] lavf/mxfdec: begin utilizing the newly parsed widths and heights
On Mon, 26 Sep 2016, Jan Ekström wrote:
* Updates the width/height sanity check to check all values against
INT_MAX.
* Correctly utilizes the stored width or height by default, and if
sampled or display values are available they are utilized.
Signed-off-by: Jan Ekström
---
libavformat/mxfdec.c | 30 +++---
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 54fc6fb..f90a85c 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -2061,15 +2061,39 @@ static int mxf_parse_structural_metadata(MXFContext
*mxf)
if (st->codecpar->codec_id == AV_CODEC_ID_NONE)
st->codecpar->codec_id = container_ul->id;
-if (descriptor->stored_width > INT_MAX || descriptor->stored_height
> INT_MAX) {
+if (descriptor->stored_width > INT_MAX || descriptor->stored_height
> INT_MAX ||
+descriptor->sampled_width > INT_MAX || descriptor->sampled_height
> INT_MAX ||
+descriptor->display_width > INT_MAX || descriptor->display_height
> INT_MAX) {
av_log(mxf->fc, AV_LOG_ERROR,
- "One or both of the descriptor's storage width/height values
does not fit within an integer! "
- "(width=%"PRIu32", height=%"PRIu32")\n",
descriptor->stored_width, descriptor->stored_height);
+ "One or more of the descriptor's storage width/height values
does not fit within an integer:\n"
+ "(stored_width=%"PRIu32", stored_height=%"PRIu32")\n"
+ "(sampled_width=%"PRIu32", sampled_height=%"PRIu32")\n"
+ "(display_width=%"PRIu32", display_height=%"PRIu32")\n",
+ descriptor->stored_width, descriptor->stored_height,
+ descriptor->sampled_width, descriptor->sampled_height,
+ descriptor->display_width, descriptor->display_height);
ret = AVERROR(AVERROR_PATCHWELCOME);
goto fail_and_free;
}
st->codecpar->width = descriptor->stored_width;
st->codecpar->height = descriptor->stored_height; /* Field height,
not frame height */
+
+/*
+ Widths and heights get overridden storage->sampled->display.
+ In case of an unset value the previous value shall be used.
+*/
+if (descriptor->sampled_width)
+st->codecpar->width = descriptor->sampled_width;
+
+if (descriptor->display_width)
+st->codecpar->width = descriptor->display_width;
+
+if (descriptor->sampled_height)
+st->codecpar->height = descriptor->sampled_height;
+
+if (descriptor->display_height)
+st->codecpar->height = descriptor->display_height;
Overriding width/height with display width/height does not seem right,
check what happens with a PAL IMX50 MXF file for example. If
you want to signal this, then a stream side data with some AVPanScan
values might make more sense.
Regards,
Marton
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 1/2] lavf/mxfdec: add support for all of the picture size and offset fields
* Renames the `width` and `height` entries to `stored_{width,height}`
according to the specification's naming.
* Switches the data type of widths and heights to uint32_t according
to specification, adds additional checks to make sure we don't
overflow INT_MAX as codecpar->{width,height} are signed integers.
* Adds and parses the sampled and display width and height entries.
* Adds and parses the sampled and display X/Y offsets. These together
with the additional widths and heights enable future support for
container cropping if and when there will be generic tooling for
it within FFmpeg.
Signed-off-by: Jan Ekström
---
libavformat/mxfdec.c | 60 ++--
1 file changed, 54 insertions(+), 6 deletions(-)
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 1939761..54fc6fb 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -170,8 +170,17 @@ typedef struct MXFDescriptor {
UID codec_ul;
AVRational sample_rate;
AVRational aspect_ratio;
-int width;
-int height; /* Field height, not frame height */
+/* In case of frame_layout == SeparateFields or SegmentedFrame, height is
of field, not frame */
+uint32_t stored_width;
+uint32_t stored_height;
+uint32_t sampled_width;
+uint32_t sampled_height;
+int32_t sampled_x_offset;
+int32_t sampled_y_offset;
+uint32_t display_width;
+uint32_t display_height;
+int32_t display_x_offset;
+int32_t display_y_offset;
int frame_layout; /* See MXFFrameLayout enum */
#define MXF_TFF 1
#define MXF_BFF 2
@@ -988,10 +997,34 @@ static int mxf_read_generic_descriptor(void *arg,
AVIOContext *pb, int tag, int
avio_read(pb, descriptor->essence_codec_ul, 16);
break;
case 0x3203:
-descriptor->width = avio_rb32(pb);
+descriptor->stored_width = avio_rb32(pb);
break;
case 0x3202:
-descriptor->height = avio_rb32(pb);
+descriptor->stored_height = avio_rb32(pb);
+break;
+case 0x3205:
+descriptor->sampled_width = avio_rb32(pb);
+break;
+case 0x3204:
+descriptor->sampled_height = avio_rb32(pb);
+break;
+case 0x3206:
+descriptor->sampled_x_offset = avio_rb32(pb);
+break;
+case 0x3207:
+descriptor->sampled_y_offset = avio_rb32(pb);
+break;
+case 0x3209:
+descriptor->display_width = avio_rb32(pb);
+break;
+case 0x3208:
+descriptor->display_height = avio_rb32(pb);
+break;
+case 0x320A:
+descriptor->display_x_offset = avio_rb32(pb);
+break;
+case 0x320B:
+descriptor->display_y_offset = avio_rb32(pb);
break;
case 0x320C:
descriptor->frame_layout = avio_r8(pb);
@@ -2027,8 +2060,16 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
container_ul = mxf_get_codec_ul(mxf_picture_essence_container_uls,
essence_container_ul);
if (st->codecpar->codec_id == AV_CODEC_ID_NONE)
st->codecpar->codec_id = container_ul->id;
-st->codecpar->width = descriptor->width;
-st->codecpar->height = descriptor->height; /* Field height, not
frame height */
+
+if (descriptor->stored_width > INT_MAX ||
descriptor->stored_height > INT_MAX) {
+av_log(mxf->fc, AV_LOG_ERROR,
+ "One or both of the descriptor's storage width/height
values does not fit within an integer! "
+ "(width=%"PRIu32", height=%"PRIu32")\n",
descriptor->stored_width, descriptor->stored_height);
+ret = AVERROR(AVERROR_PATCHWELCOME);
+goto fail_and_free;
+}
+st->codecpar->width = descriptor->stored_width;
+st->codecpar->height = descriptor->stored_height; /* Field height,
not frame height */
switch (descriptor->frame_layout) {
case FullFrame:
st->codecpar->field_order = AV_FIELD_PROGRESSIVE;
@@ -2058,6 +2099,13 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
case 0: // we already have many samples with
field_dominance == unknown
break;
}
+if ((st->codecpar->height * 2) > INT_MAX) {
+av_log(mxf->fc, AV_LOG_ERROR,
+ "Field height duplicated does not fit within an
integer! (height*2=%"PRIu64")\n",
+ ((uint64_t)st->codecpar->height) * 2);
+ret = AVERROR(AVERROR_PATCHWELCOME);
+goto fail_and_free;
+}
/* Turn field height into frame height. */
st->codecpar->height *= 2;
break;
--
2.7.4
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffm
[FFmpeg-devel] [PATCH 2/2] lavf/mxfdec: begin utilizing the newly parsed widths and heights
* Updates the width/height sanity check to check all values against
INT_MAX.
* Correctly utilizes the stored width or height by default, and if
sampled or display values are available they are utilized.
Signed-off-by: Jan Ekström
---
libavformat/mxfdec.c | 30 +++---
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 54fc6fb..f90a85c 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -2061,15 +2061,39 @@ static int mxf_parse_structural_metadata(MXFContext
*mxf)
if (st->codecpar->codec_id == AV_CODEC_ID_NONE)
st->codecpar->codec_id = container_ul->id;
-if (descriptor->stored_width > INT_MAX ||
descriptor->stored_height > INT_MAX) {
+if (descriptor->stored_width > INT_MAX ||
descriptor->stored_height > INT_MAX ||
+descriptor->sampled_width > INT_MAX ||
descriptor->sampled_height > INT_MAX ||
+descriptor->display_width > INT_MAX ||
descriptor->display_height > INT_MAX) {
av_log(mxf->fc, AV_LOG_ERROR,
- "One or both of the descriptor's storage width/height
values does not fit within an integer! "
- "(width=%"PRIu32", height=%"PRIu32")\n",
descriptor->stored_width, descriptor->stored_height);
+ "One or more of the descriptor's storage width/height
values does not fit within an integer:\n"
+ "(stored_width=%"PRIu32", stored_height=%"PRIu32")\n"
+ "(sampled_width=%"PRIu32", sampled_height=%"PRIu32")\n"
+ "(display_width=%"PRIu32", display_height=%"PRIu32")\n",
+ descriptor->stored_width, descriptor->stored_height,
+ descriptor->sampled_width, descriptor->sampled_height,
+ descriptor->display_width, descriptor->display_height);
ret = AVERROR(AVERROR_PATCHWELCOME);
goto fail_and_free;
}
st->codecpar->width = descriptor->stored_width;
st->codecpar->height = descriptor->stored_height; /* Field height,
not frame height */
+
+/*
+ Widths and heights get overridden storage->sampled->display.
+ In case of an unset value the previous value shall be used.
+*/
+if (descriptor->sampled_width)
+st->codecpar->width = descriptor->sampled_width;
+
+if (descriptor->display_width)
+st->codecpar->width = descriptor->display_width;
+
+if (descriptor->sampled_height)
+st->codecpar->height = descriptor->sampled_height;
+
+if (descriptor->display_height)
+st->codecpar->height = descriptor->display_height;
+
switch (descriptor->frame_layout) {
case FullFrame:
st->codecpar->field_order = AV_FIELD_PROGRESSIVE;
--
2.7.4
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] avcodec: don't include vdpau_compat.h when vdpau is not enabled
On Sat, Sep 03, 2016 at 11:22:43AM +0200, Michael Niedermayer wrote: > On Fri, Aug 05, 2016 at 11:24:35PM +0200, Carl Eugen Hoyos wrote: > > Hi! > > > > 2016-08-04 16:01 GMT+02:00 James Almer : > > >> So the advantage is that compilation gets measurably faster > > >> with your patch? > > > > > > No, our headers are not the Boost package. i just want to reduce > > > dependencies so they don't get recompiled every time you modify > > > any of those 10+ unrelated headers or their dependencies. > > > > If you believe this helps, I can't object. > > whats the status of this ? > > is this droped ? > does it need a review ? > > iam asking due to pachwork showing this as "NEW" without being > delegated to anyone. Updating statuses in patchwork is important to > keep patchwork effective as a way to keep track of patches ... > (it cannot know if a patch was dropped or is still waiting on somethig) marked the patch as delegated to jamrial (i think thats correct as carl seems to have withdrawn his objection) [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Why not whip the teacher when the pupil misbehaves? -- Diogenes of Sinope signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH]lavf/utils: Do not overflow in update_initial_timestamps().
On Sun, Sep 25, 2016 at 09:04:30PM +0200, Carl Eugen Hoyos wrote: > 2016-09-25 20:59 GMT+02:00 Michael Niedermayer : > > On Sat, Sep 24, 2016 at 03:28:36PM +0200, Carl Eugen Hoyos wrote: > >> Hi! > >> > >> Attached patch hopefully fixes ticket #5136. > >> > >> Please review, Carl Eugen > > > >> utils.c |4 +++- > >> 1 file changed, 3 insertions(+), 1 deletion(-) > >> 519f209901429efaf9dffec381290a6a83573deb > >> 0001-lavf-utils-Do-not-overflow-in-update_initial_timesta.patch > >> From 09a31f8f6584f0c97443fd6edc7fcf7142b6a6ff Mon Sep 17 00:00:00 2001 > >> From: Carl Eugen Hoyos > >> Date: Sat, 24 Sep 2016 15:26:21 +0200 > >> Subject: [PATCH] lavf/utils: Do not overflow in > >> update_initial_timestamps(). > >> > >> Fixes ticket #5136. > >> --- > >> libavformat/utils.c |4 +++- > >> 1 file changed, 3 insertions(+), 1 deletion(-) > > > > probably ok > > it might be ultimately easier to reject demuxer output that has > > timestamps close to INT64 MAX/MIN instead of protecting all > > computations one by one though > > I don't disagree but I am probably unable to improve the patch. > Do you want me to apply? ive posted an alternative [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Complexity theory is the science of finding the exact solution to an approximation. Benchmarking OTOH is finding an approximation of the exact signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] avformat/utils: Discard huge timestamps which would cause overflows if used in basic computations
Allowing larger timestamps makes it impossible to calculate basic things like
the
difference of 2 timestamps or their sum without checking each individual
computation for
overflow.
This should avoid a significant number of overflow checks
Fixes Ticket5136
Signed-off-by: Michael Niedermayer
---
libavformat/utils.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 3e0f57d..d227e24 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -833,6 +833,12 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt)
continue;
}
+if ( (pkt->dts != AV_NOPTS_VALUE && (pkt->dts <= INT64_MIN/2 ||
pkt->dts >= INT64_MAX/2))
+|| (pkt->pts != AV_NOPTS_VALUE && (pkt->pts <= INT64_MIN/2 ||
pkt->pts >= INT64_MAX/2))) {
+av_log(s, AV_LOG_WARNING, "Ignoring huge timestamps %"PRId64"
%"PRId64"\n", pkt->dts, pkt->pts);
+pkt->dts = pkt->pts = AV_NOPTS_VALUE;
+}
+
st = s->streams[pkt->stream_index];
if (update_wrap_reference(s, st, pkt->stream_index, pkt) &&
st->pts_wrap_behavior == AV_PTS_WRAP_SUB_OFFSET) {
--
2.9.3
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH]lavf/movenc: Allow to disable writing the timecode track
> On Sep 25, 2016, at 1:49 PM, Michael Niedermayer > wrote: > > On Sat, Sep 24, 2016 at 10:40:35PM +0200, Carl Eugen Hoyos wrote: >> Hi! >> >> Not everybody is happy about a timecode track in mp4, >> see ticket #5492. >> >> Please comment, Carl Eugen > >> doc/muxers.texi |3 +++ >> libavformat/movenc.c |6 -- >> libavformat/movenc.h |1 + >> 3 files changed, 8 insertions(+), 2 deletions(-) >> 1ff491854d9a8c694b38153561d873b55688bb13 >> 0001-lavf-movenc-Allow-to-disable-writing-the-timecode-tr.patch >> From 47a813709643106b0d0a2eceff822107c395d15c Mon Sep 17 00:00:00 2001 >> From: Carl Eugen Hoyos >> Date: Sat, 24 Sep 2016 22:38:14 +0200 >> Subject: [PATCH] lavf/movenc: Allow to disable writing the timecode track. >> >> Fixes ticket #5492. >> --- >> doc/muxers.texi |3 +++ >> libavformat/movenc.c |6 -- >> libavformat/movenc.h |1 + >> 3 files changed, 8 insertions(+), 2 deletions(-) > > should be ok, but please wait a day with applying so others can > comment too +1 Tested this and it works well and solves an issue that I occasionally find. Thanks Carl. [...] Dave Rice ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH]lavf/movenc: Allow to disable writing the timecode track
On Sat, Sep 24, 2016 at 10:40:35PM +0200, Carl Eugen Hoyos wrote:
> Hi!
>
> Not everybody is happy about a timecode track in mp4,
> see ticket #5492.
>
> Please comment, Carl Eugen
> From 47a813709643106b0d0a2eceff822107c395d15c Mon Sep 17 00:00:00 2001
> From: Carl Eugen Hoyos
> Date: Sat, 24 Sep 2016 22:38:14 +0200
> Subject: [PATCH] lavf/movenc: Allow to disable writing the timecode track.
>
> Fixes ticket #5492.
> ---
> doc/muxers.texi |3 +++
> libavformat/movenc.c |6 --
> libavformat/movenc.h |1 +
> 3 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/doc/muxers.texi b/doc/muxers.texi
> index 27eb9a0..61476ca 100644
> --- a/doc/muxers.texi
> +++ b/doc/muxers.texi
> @@ -884,6 +884,9 @@ the new default-base-is-moof flag instead. This flag is
> new from
> 14496-12:2012. This may make the fragments easier to parse in certain
> circumstances (avoiding basing track fragment location calculations
> on the implicit end of the previous track fragment).
> +@item -write_tmcd
> +Specify 1 to force writing a timecode track, 0 to disable it and -1 to
> +write a timecode track only for mov and mp4 output (default).
> @end table
>
> @subsection Example
> diff --git a/libavformat/movenc.c b/libavformat/movenc.c
> index 0382309..a5e4ad1 100644
> --- a/libavformat/movenc.c
> +++ b/libavformat/movenc.c
> @@ -90,6 +90,7 @@ static const AVOption options[] = {
> { "encryption_key", "The media encryption key (hex)",
> offsetof(MOVMuxContext, encryption_key), AV_OPT_TYPE_BINARY, .flags =
> AV_OPT_FLAG_ENCODING_PARAM },
> { "encryption_kid", "The media encryption key identifier (hex)",
> offsetof(MOVMuxContext, encryption_kid), AV_OPT_TYPE_BINARY, .flags =
> AV_OPT_FLAG_ENCODING_PARAM },
> { "use_stream_ids_as_track_ids", "use stream ids as track ids",
> offsetof(MOVMuxContext, use_stream_ids_as_track_ids), AV_OPT_TYPE_BOOL, {.i64
> = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
> +{ "write_tmcd", "force or disable writing tmcd", offsetof(MOVMuxContext,
> write_tmcd), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 1, AV_OPT_FLAG_ENCODING_PARAM},
AV_OPT_TYPE_BOOL
> { NULL },
> };
>
> @@ -2312,7 +2313,7 @@ static int mov_write_minf_tag(AVFormatContext *s,
> AVIOContext *pb, MOVMuxContext
> } else if (track->tag == MKTAG('r','t','p',' ')) {
> mov_write_hmhd_tag(pb);
> } else if (track->tag == MKTAG('t','m','c','d')) {
> -if (track->mode == MODE_MP4)
> +if (track->mode != MODE_MOV)
> mov_write_nmhd_tag(pb);
> else
> mov_write_gmhd_tag(pb, track);
> @@ -5539,7 +5540,8 @@ static int mov_write_header(AVFormatContext *s)
> }
> }
>
> -if (mov->mode == MODE_MOV || mov->mode == MODE_MP4) {
> +if ( mov->write_tmcd == -1 && (mov->mode == MODE_MOV || mov->mode ==
> MODE_MP4)
> +|| mov->write_tmcd == 1) {
> tmcd_track = mov->nb_streams;
>
> /* +1 tmcd track for each video stream with a timecode */
> diff --git a/libavformat/movenc.h b/libavformat/movenc.h
> index ea76e39..1f7a9d7 100644
> --- a/libavformat/movenc.h
> +++ b/libavformat/movenc.h
> @@ -219,6 +219,7 @@ typedef struct MOVMuxContext {
>
> int use_stream_ids_as_track_ids;
> int track_ids_ok;
> +int write_tmcd;
> } MOVMuxContext;
>
Didn't test nor looked in depth, but OK if it disable timecode in MP4 by
default. Timecode is only (badly) "standardized" in MOV, so we shouldn't
write such track in MP4.
--
Clément B.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] lavf/mpegtsenc: fix autobsf when the first NAL is 0x1 bytes
---
libavformat/mpegtsenc.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index fd849e5..ac27b81 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -1790,11 +1790,15 @@ static int mpegts_check_bitstream(struct
AVFormatContext *s, const AVPacket *pkt
if (st->codecpar->codec_id == AV_CODEC_ID_H264) {
if (pkt->size >= 5 && AV_RB32(pkt->data) != 0x001 &&
- AV_RB24(pkt->data) != 0x01)
+ (AV_RB24(pkt->data) != 0x01 ||
+ (st->codecpar->extradata_size > 0 &&
+ st->codecpar->extradata[0] == 1)))
ret = ff_stream_add_bitstream_filter(st, "h264_mp4toannexb", NULL);
} else if (st->codecpar->codec_id == AV_CODEC_ID_HEVC) {
if (pkt->size >= 5 && AV_RB32(pkt->data) != 0x001 &&
- AV_RB24(pkt->data) != 0x01)
+ (AV_RB24(pkt->data) != 0x01 ||
+ (st->codecpar->extradata_size > 0 &&
+ st->codecpar->extradata[0] == 1)))
ret = ff_stream_add_bitstream_filter(st, "hevc_mp4toannexb", NULL);
}
--
2.10.0
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 2/2] ffmpeg: fix memleak of bitstream filter context on failure
On 9/24/2016 9:29 PM, Josh de Kock wrote: > On 24/09/2016 19:24, James Almer wrote: >> [...] > > Both patches look good to me. > > -- > Josh Pushed, thanks. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH]lavf/utils: Do not overflow in update_initial_timestamps().
2016-09-25 20:59 GMT+02:00 Michael Niedermayer : > On Sat, Sep 24, 2016 at 03:28:36PM +0200, Carl Eugen Hoyos wrote: >> Hi! >> >> Attached patch hopefully fixes ticket #5136. >> >> Please review, Carl Eugen > >> utils.c |4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> 519f209901429efaf9dffec381290a6a83573deb >> 0001-lavf-utils-Do-not-overflow-in-update_initial_timesta.patch >> From 09a31f8f6584f0c97443fd6edc7fcf7142b6a6ff Mon Sep 17 00:00:00 2001 >> From: Carl Eugen Hoyos >> Date: Sat, 24 Sep 2016 15:26:21 +0200 >> Subject: [PATCH] lavf/utils: Do not overflow in >> update_initial_timestamps(). >> >> Fixes ticket #5136. >> --- >> libavformat/utils.c |4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) > > probably ok > it might be ultimately easier to reject demuxer output that has > timestamps close to INT64 MAX/MIN instead of protecting all > computations one by one though I don't disagree but I am probably unable to improve the patch. Do you want me to apply? Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH]lavf/utils: Do not overflow in update_initial_timestamps().
On Sat, Sep 24, 2016 at 03:28:36PM +0200, Carl Eugen Hoyos wrote: > Hi! > > Attached patch hopefully fixes ticket #5136. > > Please review, Carl Eugen > utils.c |4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > 519f209901429efaf9dffec381290a6a83573deb > 0001-lavf-utils-Do-not-overflow-in-update_initial_timesta.patch > From 09a31f8f6584f0c97443fd6edc7fcf7142b6a6ff Mon Sep 17 00:00:00 2001 > From: Carl Eugen Hoyos > Date: Sat, 24 Sep 2016 15:26:21 +0200 > Subject: [PATCH] lavf/utils: Do not overflow in update_initial_timestamps(). > > Fixes ticket #5136. > --- > libavformat/utils.c |4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) probably ok it might be ultimately easier to reject demuxer output that has timestamps close to INT64 MAX/MIN instead of protecting all computations one by one though thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB it is not once nor twice but times without number that the same ideas make their appearance in the world. -- Aristotle signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH]lavf/movenc: Allow to disable writing the timecode track
On Sat, Sep 24, 2016 at 10:40:35PM +0200, Carl Eugen Hoyos wrote: > Hi! > > Not everybody is happy about a timecode track in mp4, > see ticket #5492. > > Please comment, Carl Eugen > doc/muxers.texi |3 +++ > libavformat/movenc.c |6 -- > libavformat/movenc.h |1 + > 3 files changed, 8 insertions(+), 2 deletions(-) > 1ff491854d9a8c694b38153561d873b55688bb13 > 0001-lavf-movenc-Allow-to-disable-writing-the-timecode-tr.patch > From 47a813709643106b0d0a2eceff822107c395d15c Mon Sep 17 00:00:00 2001 > From: Carl Eugen Hoyos > Date: Sat, 24 Sep 2016 22:38:14 +0200 > Subject: [PATCH] lavf/movenc: Allow to disable writing the timecode track. > > Fixes ticket #5492. > --- > doc/muxers.texi |3 +++ > libavformat/movenc.c |6 -- > libavformat/movenc.h |1 + > 3 files changed, 8 insertions(+), 2 deletions(-) should be ok, but please wait a day with applying so others can comment too [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB I know you won't believe me, but the highest form of Human Excellence is to question oneself and others. -- Socrates signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] doc/libav-merge: complete TODO section
On Sun, Sep 25, 2016 at 06:36:15PM +0100, Josh de Kock wrote: > On 25/09/2016 18:35, Clément Bœsch wrote: > > --- > > What else is missing? > > --- > > doc/libav-merge.txt | 10 ++ > > 1 file changed, 10 insertions(+) > > > > diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt > > index 4fd863e..e200bdb 100644 > > --- a/doc/libav-merge.txt > > +++ b/doc/libav-merge.txt > > @@ -84,4 +84,14 @@ whitespace differences) are passed into colordiff. > > TODO/FIXME/UNMERGED > > === > > > > +Stuff that didn't reach the codebase: > > +- > > + > > - HEVC DSP and x86 MC SIMD improvements from Libav (see > > http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/204917) > > + > This link is broken. unrelated to this patch but fix pushed -- Clément B. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] doc/libav-merge: complete TODO section
On 25/09/2016 18:35, Clément Bœsch wrote: --- What else is missing? --- doc/libav-merge.txt | 10 ++ 1 file changed, 10 insertions(+) diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt index 4fd863e..e200bdb 100644 --- a/doc/libav-merge.txt +++ b/doc/libav-merge.txt @@ -84,4 +84,14 @@ whitespace differences) are passed into colordiff. TODO/FIXME/UNMERGED === +Stuff that didn't reach the codebase: +- + - HEVC DSP and x86 MC SIMD improvements from Libav (see http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/204917) + This link is broken. +Collateral damage that needs work locally: +-- + +- Merge proresdec2.c and proresdec_lgpl.c +- Merge proresenc_anatoliy.c and proresenc_kostya.c +- Remove ADVANCED_PARSER in libavcodec/hevc_parser.c ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] doc/libav-merge: complete TODO section
--- What else is missing? --- doc/libav-merge.txt | 10 ++ 1 file changed, 10 insertions(+) diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt index 4fd863e..e200bdb 100644 --- a/doc/libav-merge.txt +++ b/doc/libav-merge.txt @@ -84,4 +84,14 @@ whitespace differences) are passed into colordiff. TODO/FIXME/UNMERGED === +Stuff that didn't reach the codebase: +- + - HEVC DSP and x86 MC SIMD improvements from Libav (see http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/204917) + +Collateral damage that needs work locally: +-- + +- Merge proresdec2.c and proresdec_lgpl.c +- Merge proresenc_anatoliy.c and proresenc_kostya.c +- Remove ADVANCED_PARSER in libavcodec/hevc_parser.c -- 2.10.0 ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] lavf: add ffprobe demuxer
On date Saturday 2016-09-24 15:21:11 +0200, wm4 encoded: > On Fri, 23 Sep 2016 19:46:16 +0200 > Stefano Sabatini wrote: > > > On date Friday 2016-09-23 09:34:19 +0200, wm4 encoded: > > > On Thu, 22 Sep 2016 18:50:27 +0200 > > > Stefano Sabatini wrote: > > [...] > > > > Ping. I'd like to commit this if there are no objections. Also, > > > > possibly add a muxer to generate output directly readable by the > > > > demuxer (this way we don't need ffprobe for generating the output, and > > > > we avoid the ordering issue). > > > > > > I'm sorry to jump in as a nay-sayer, but it looks like a quite fishy > > > concept and I still don't get why it's supposed to be needed. The > > > documentation also doesn't say what this is supposed to be useful for. > > > > I'll extend the documentation to add some possibly useful use cases. > > > > My use case: I need to build a data stream with scripting/manual > > editing. Since I don't want to have to rely on a binary format (which > > is not ideal for that use case) I needed a format simple enough to be > > written and analysed without special tools, but with a simple text > > editor. > > I still don't get it. Your description makes me think of something like > EDL, but that doesn't seem to have anything to do with it. EDL as "Edit Decision List"? No I don't think this is related at all. Suppose you want to inject a data stream, you have the data and you know where to insert it given its PTS. With this muxer you can handcraft a textual file in the ffprobe_default format and use ffmpeg to inject the new data stream. -- FFmpeg = Furious and Fancy Mystic Peaceful Exciting Guru ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] lavd/sdl2: remove unused code
On 24/09/2016 19:01, Josh de Kock wrote: Signed-off-by: Josh de Kock --- libavdevice/sdl2.c | 27 +-- 1 file changed, 5 insertions(+), 22 deletions(-) [...] Applied. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v3] lavd/sdl2: add sdl alias
On 25/09/2016 14:51, Josh de Kock wrote: On 25/09/2016 14:50, Carl Eugen Hoyos wrote: 2016-09-25 15:48 GMT+02:00 Josh de Kock : On 25/09/2016 14:43, Carl Eugen Hoyos wrote: 2016-09-25 15:40 GMT+02:00 Josh de Kock : On 25/09/2016 14:38, Carl Eugen Hoyos wrote: This is missing the important change to the help output. These changes are only to not break current scripts, users should use --disable-sdl2. Why? This makes no sense, we don't use version information for other libraries. Other libraries don't change their name, unfortunately SDL did, so we have to reflect that change. Isn't it much kinder to our users if the change is completely transparent for them? For users, nothing will change. Everything will still work as it did. Applied as-is. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] avcodec/mpegvideo_enc: fix memory leak
Le quartidi 4 vendémiaire, an CCXXV, Carl Eugen Hoyos a écrit : > (Massive) memory consumption. That would be if the consumption was necessary. Regards, -- Nicolas George signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] avcodec/mpegvideo_enc: fix memory leak
2016-09-25 16:00 GMT+02:00 Nicolas George : > Le quartidi 4 vendémiaire, an CCXXV, Carl Eugen Hoyos a écrit : >> > And without this, ffmpeg keeps using more and more memory. >> > So while the memory is eventually freed when the encoding is done >> I believe this defines it as not being a leak. > > I believe you are wrong. It is not the same kind of leaks than usual, and > not the kind of leak that valgrind can detect, but any repeated allocations > that are not freed in a timely fashion when they are not needed anymore > constitute a leak. Fine with me. (I am just surprised that other developers have often used another definition on our various bug trackers that makes much more sense to me.) Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] avcodec/mpegvideo_enc: fix memory leak
2016-09-25 15:59 GMT+02:00 Timo Rothenpieler : >>> And without this, ffmpeg keeps using more and more memory. >>> So while the memory is eventually freed when the encoding is done >> >> I believe this defines it as not being a leak. > > What else would it be? (Massive) memory consumption. Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] avcodec/mpegvideo_enc: fix memory leak
Le quartidi 4 vendémiaire, an CCXXV, Carl Eugen Hoyos a écrit : > > And without this, ffmpeg keeps using more and more memory. > > So while the memory is eventually freed when the encoding is done > I believe this defines it as not being a leak. I believe you are wrong. It is not the same kind of leaks than usual, and not the kind of leak that valgrind can detect, but any repeated allocations that are not freed in a timely fashion when they are not needed anymore constitute a leak. Regards, -- Nicolas George signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] avcodec/mpegvideo_enc: fix memory leak
On 9/25/2016 3:55 PM, Carl Eugen Hoyos wrote: > 2016-09-25 15:47 GMT+02:00 Timo Rothenpieler : >> On 9/25/2016 3:44 PM, Carl Eugen Hoyos wrote: >>> 2016-09-25 15:43 GMT+02:00 Timo Rothenpieler : When the input frames contain side data, it will accumulate endlessly in the coded frame, as av_frame_copy_props will append any new side data. >>> >>> But there is no leak, no? >>> Is this related to ticket #5799? >> >> This fixes that ticket for me, yes. > > Please mention this in the commit message. > Added locally. >> And without this, ffmpeg keeps using more and more memory. >> So while the memory is eventually freed when the encoding is done > > I believe this defines it as not being a leak. What else would it be? I think speaking of a leak here is still valid. > Thank you for fixing this, Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] avcodec/mpegvideo_enc: fix memory leak
2016-09-25 15:47 GMT+02:00 Timo Rothenpieler : > On 9/25/2016 3:44 PM, Carl Eugen Hoyos wrote: >> 2016-09-25 15:43 GMT+02:00 Timo Rothenpieler : >>> When the input frames contain side data, it will accumulate >>> endlessly in the coded frame, as av_frame_copy_props will >>> append any new side data. >> >> But there is no leak, no? >> Is this related to ticket #5799? > > This fixes that ticket for me, yes. Please mention this in the commit message. > And without this, ffmpeg keeps using more and more memory. > So while the memory is eventually freed when the encoding is done I believe this defines it as not being a leak. Thank you for fixing this, Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v3] lavd/sdl2: add sdl alias
On 25/09/2016 14:50, Carl Eugen Hoyos wrote: 2016-09-25 15:48 GMT+02:00 Josh de Kock : On 25/09/2016 14:43, Carl Eugen Hoyos wrote: 2016-09-25 15:40 GMT+02:00 Josh de Kock : On 25/09/2016 14:38, Carl Eugen Hoyos wrote: This is missing the important change to the help output. These changes are only to not break current scripts, users should use --disable-sdl2. Why? This makes no sense, we don't use version information for other libraries. Other libraries don't change their name, unfortunately SDL did, so we have to reflect that change. Isn't it much kinder to our users if the change is completely transparent for them? For users, nothing will change. Everything will still work as it did. -- Josh ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v3] lavd/sdl2: add sdl alias
2016-09-25 15:48 GMT+02:00 Josh de Kock : > On 25/09/2016 14:43, Carl Eugen Hoyos wrote: >> >> 2016-09-25 15:40 GMT+02:00 Josh de Kock : >>> >>> On 25/09/2016 14:38, Carl Eugen Hoyos wrote: >> This is missing the important change to the help output. >>> These changes are only to not break current scripts, >>> users should use --disable-sdl2. >> >> Why? >> This makes no sense, we don't use version >> information for other libraries. >> > Other libraries don't change their name, unfortunately > SDL did, so we have to reflect that change. Isn't it much kinder to our users if the change is completely transparent for them? Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v3] lavd/sdl2: add sdl alias
On 25/09/2016 14:43, Carl Eugen Hoyos wrote: 2016-09-25 15:40 GMT+02:00 Josh de Kock : On 25/09/2016 14:38, Carl Eugen Hoyos wrote: This is missing the important change to the help output. These changes are only to not break current scripts, users should use --disable-sdl2. Why? This makes no sense, we don't use version information for other libraries. Other libraries don't change their name, unfortunately SDL did, so we have to reflect that change. -- Josh ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] avcodec/mpegvideo_enc: fix memory leak
On 9/25/2016 3:44 PM, Carl Eugen Hoyos wrote: > 2016-09-25 15:43 GMT+02:00 Timo Rothenpieler : >> When the input frames contain side data, it will accumulate endlessly in >> the coded frame, as av_frame_copy_props will append any new side data. > > But there is no leak, no? > Is this related to ticket #5799? This fixes that ticket for me, yes. And without this, ffmpeg keeps using more and more memory. So while the memory is eventually freed when the encoding is done, it still seems like a leak to me. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] avcodec/mpegvideo_enc: fix memory leak
2016-09-25 15:43 GMT+02:00 Timo Rothenpieler : > When the input frames contain side data, it will accumulate endlessly in > the coded frame, as av_frame_copy_props will append any new side data. But there is no leak, no? Is this related to ticket #5799? Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v3] lavd/sdl2: add sdl alias
2016-09-25 15:40 GMT+02:00 Josh de Kock : > On 25/09/2016 14:38, Carl Eugen Hoyos wrote: >> This is missing the important change to >> the help output. >> > > These changes are only to not break current scripts, > users should use --disable-sdl2. Why? This makes no sense, we don't use version information for other libraries. Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] avcodec/mpegvideo_enc: fix memory leak
When the input frames contain side data, it will accumulate endlessly in the coded frame, as av_frame_copy_props will append any new side data. --- libavcodec/mpegvideo_enc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 87d7954..5cd654f 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1735,6 +1735,7 @@ static void frame_end(MpegEncContext *s) #if FF_API_CODED_FRAME FF_DISABLE_DEPRECATION_WARNINGS +av_frame_unref(s->avctx->coded_frame); av_frame_copy_props(s->avctx->coded_frame, s->current_picture.f); FF_ENABLE_DEPRECATION_WARNINGS #endif -- 2.10.0 ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v3] lavd/sdl2: add sdl alias
On 25/09/2016 14:38, Carl Eugen Hoyos wrote: 2016-09-25 15:29 GMT+02:00 Josh de Kock : This commit also adds an sdl alias for the configure script. Signed-off-by: Josh de Kock --- configure | 2 ++ This is missing the important change to the help output. These changes are only to not break current scripts, users should use --disable-sdl2. -- Josh ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v3] lavd/sdl2: add sdl alias
2016-09-25 15:29 GMT+02:00 Josh de Kock : > This commit also adds an sdl alias for the configure script. > > Signed-off-by: Josh de Kock > --- > configure | 2 ++ This is missing the important change to the help output. Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH v3] lavd/sdl2: add sdl alias
This commit also adds an sdl alias for the configure script.
Signed-off-by: Josh de Kock
---
configure | 2 ++
libavdevice/sdl2.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index f593191..899057d 100755
--- a/configure
+++ b/configure
@@ -1547,6 +1547,7 @@ EXTERNAL_LIBRARY_LIST="
opengl
openssl
schannel
+sdl
sdl2
securetransport
videotoolbox
@@ -5846,6 +5847,7 @@ if enabled gcrypt; then
fi
fi
+disabled sdl && disable sdl2
if ! disabled sdl2; then
SDL2_CONFIG="${cross_prefix}sdl2-config"
if check_pkg_config sdl2 SDL_events.h SDL_PollEvent; then
diff --git a/libavdevice/sdl2.c b/libavdevice/sdl2.c
index 217ccc0..5d9e91e 100644
--- a/libavdevice/sdl2.c
+++ b/libavdevice/sdl2.c
@@ -352,7 +352,7 @@ static const AVClass sdl2_class = {
};
AVOutputFormat ff_sdl2_muxer = {
-.name = "sdl2",
+.name = "sdl,sdl2",
.long_name = NULL_IF_CONFIG_SMALL("SDL2 output device"),
.priv_data_size = sizeof(SDLContext),
.audio_codec= AV_CODEC_ID_NONE,
--
2.8.4 (Apple Git-73)
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] lavd/sdl2: add sdl alias
2016-09-25 14:59 GMT+02:00 Josh de Kock :
>
>
> On 25/09/2016 13:57, Carl Eugen Hoyos wrote:
>>
>> 2016-09-25 14:51 GMT+02:00 Josh de Kock :
>>>
>>> On 25/09/2016 13:45, Carl Eugen Hoyos wrote:
2016-09-25 14:28 GMT+02:00 Josh de Kock :
>
>
> Signed-off-by: Josh de Kock
> ---
>
> The --enable-sdl2 option is not being renamed because it's a fairly
> big change and sdl2 is incompatible with sdl.
How is (old) sdl in FFmpeg incompatible with the new sdl2 in FFmpeg?
Please rename it.
>>>
>>>
>>> Do you have a way to rename the option but not the device?
>>
>>
>> I don't understand this question:
>> How is the name of a configure option disabling an external library
>> related to the name of a device in libavdevice?
>
> Sorry, I meant the external lib, not the device.
>
>>> Unless you're suggesting renaming the whole device, and then
>>> I'd like to know a way to have the check_pkg_config work with a
>>> different library name to what it searches for.
>>
>>
>> There is an option --disable-foo that you removed and instead
>> you added a new optoin --disable-foo2. Please rename
>> --disable-foo2 to --disable-foo.
>>
> Yes, I'm saying I don't know how to achieve this without renaming the ext
> lib name (which obviously can't change).
diff --git a/configure b/configure
index f593191..dbd16de 100755
--- a/configure
+++ b/configure
@@ -291,7 +291,7 @@ External library support:
if gnutls is not used [no]
--disable-schannel disable SChannel SSP, needed for TLS support on
Windows if openssl and gnutls are not used
[autodetect]
- --disable-sdl2 disable sdl2 [autodetect]
+ --disable-sdldisable sdl2 [autodetect]
--disable-securetransport disable Secure Transport, needed for TLS support
on OSX if openssl and gnutls are not used
[autodetect]
--enable-x11grab enable X11 grabbing (legacy) [no]
@@ -1547,6 +1547,7 @@ EXTERNAL_LIBRARY_LIST="
opengl
openssl
schannel
+sdl
sdl2
securetransport
videotoolbox
@@ -5846,6 +5847,7 @@ if enabled gcrypt; then
fi
fi
+disabled sdl && disable sdl2
if ! disabled sdl2; then
SDL2_CONFIG="${cross_prefix}sdl2-config"
if check_pkg_config sdl2 SDL_events.h SDL_PollEvent; then
An better and shorter alternative is "if ! disabled sdl; then"
Carl Eugen
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] lavd/sdl2: add sdl alias
On 25/09/2016 13:57, Carl Eugen Hoyos wrote: 2016-09-25 14:51 GMT+02:00 Josh de Kock : On 25/09/2016 13:45, Carl Eugen Hoyos wrote: 2016-09-25 14:28 GMT+02:00 Josh de Kock : Signed-off-by: Josh de Kock --- The --enable-sdl2 option is not being renamed because it's a fairly big change and sdl2 is incompatible with sdl. How is (old) sdl in FFmpeg incompatible with the new sdl2 in FFmpeg? Please rename it. Do you have a way to rename the option but not the device? I don't understand this question: How is the name of a configure option disabling an external library related to the name of a device in libavdevice? Sorry, I meant the external lib, not the device. Unless you're suggesting renaming the whole device, and then I'd like to know a way to have the check_pkg_config work with a different library name to what it searches for. There is an option --disable-foo that you removed and instead you added a new optoin --disable-foo2. Please rename --disable-foo2 to --disable-foo. Yes, I'm saying I don't know how to achieve this without renaming the ext lib name (which obviously can't change). -- Josh ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] lavd/sdl2: add sdl alias
2016-09-25 14:51 GMT+02:00 Josh de Kock : > On 25/09/2016 13:45, Carl Eugen Hoyos wrote: >> >> 2016-09-25 14:28 GMT+02:00 Josh de Kock : >>> >>> Signed-off-by: Josh de Kock >>> --- >>> >>> The --enable-sdl2 option is not being renamed because it's a fairly >>> big change and sdl2 is incompatible with sdl. >> >> >> How is (old) sdl in FFmpeg incompatible with the new sdl2 in FFmpeg? >> >> Please rename it. > > Do you have a way to rename the option but not the device? I don't understand this question: How is the name of a configure option disabling an external library related to the name of a device in libavdevice? > Unless you're suggesting renaming the whole device, and then > I'd like to know a way to have the check_pkg_config work with a > different library name to what it searches for. There is an option --disable-foo that you removed and instead you added a new optoin --disable-foo2. Please rename --disable-foo2 to --disable-foo. Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] lavd/sdl2: add sdl alias
On 25/09/2016 13:45, Carl Eugen Hoyos wrote: 2016-09-25 14:28 GMT+02:00 Josh de Kock : Signed-off-by: Josh de Kock --- The --enable-sdl2 option is not being renamed because it's a fairly big change and sdl2 is incompatible with sdl. How is (old) sdl in FFmpeg incompatible with the new sdl2 in FFmpeg? Please rename it. Do you have a way to rename the option but not the device? Unless you're suggesting renaming the whole device, and then I'd like to know a way to have the check_pkg_config work with a different library name to what it searches for. -- Josh ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] lavd/sdl2: add sdl alias
2016-09-25 14:28 GMT+02:00 Josh de Kock : > Signed-off-by: Josh de Kock > --- > > The --enable-sdl2 option is not being renamed because it's a fairly > big change and sdl2 is incompatible with sdl. How is (old) sdl in FFmpeg incompatible with the new sdl2 in FFmpeg? Please rename it. Patch ok, Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [OPW] OPW Project Proposal
Hi folks, I am Pallavi Kumari, a recent graduate in Computer Science from IIIT Hyderabad, India. My areas of interest includes Information Retrieval and Extraction, Machine learning, Deep learning , algorithms. I have sound knowledge C, C++, Python and am familiar with various open source technologies like Git, Django, elastic search, redis, mongodb etc. I have some experience with open source contributions and have contributed to some organizations like Mozilla, Ubuntu, Fedora. Built a text based search engine from scratch on Wikipedia dump. I want to propose the idea of implementing filters for ffmpeg that would give different audio fingerprints for an audio which could be reused by other people for variety of applications. Goal of this system is given a song as a input, it would spits out similar sounding songs. Some of its applications are: * detecting duplicate songs * retrieving similar songs * can be used for recommending songs * clustering songs based on content/tags I had discuss this idea with Compn on #ffmpeg-devel irc which he finds interesting and suggested me to put it on the mailing list. I am excited about this project and would like to contribute to it and would be glad to know your views on it. Kindly, let me know if the proposed idea sounds interesting and relevant to the community. I would be happy to share a rough draft containing details. Let me know the further procedure. Your guidance is highly appreciated. Regards, Pallavi IRC - atana ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH]lavc/8bps: Fix 32bit output of 24bit video
Hi!
Attached patch fixes a long-time regression.
Please comment, Carl Eugen
From 2b991a66c4bf14774210e2c7bfb0bb5f0e4f1b8f Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos
Date: Sun, 25 Sep 2016 14:27:43 +0200
Subject: [PATCH] lavc/8bps: Fix 32bit output of 24bit video.
Regression since / partial revert of ba3bb53b
---
libavcodec/8bps.c | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c
index 46344e0..49fd445 100644
--- a/libavcodec/8bps.c
+++ b/libavcodec/8bps.c
@@ -41,7 +41,7 @@
static const enum AVPixelFormat pixfmt_rgb24[] = {
-AV_PIX_FMT_BGR24, AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE };
+AV_PIX_FMT_BGR24, AV_PIX_FMT_0RGB32, AV_PIX_FMT_NONE };
typedef struct EightBpsContext {
AVCodecContext *avctx;
@@ -65,6 +65,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
unsigned int dlen, p, row;
const unsigned char *lp, *dp, *ep;
unsigned char count;
+unsigned int px_inc;
unsigned int planes = c->planes;
unsigned char *planemap = c->planemap;
int ret;
@@ -77,6 +78,8 @@ static int decode_frame(AVCodecContext *avctx, void *data,
/* Set data pointer after line lengths */
dp = encoded + planes * (height << 1);
+px_inc = planes + (avctx->pix_fmt == AV_PIX_FMT_0RGB32);
+
for (p = 0; p < planes; p++) {
/* Lines length pointer for this plane */
lp = encoded + p * (height << 1);
@@ -95,21 +98,21 @@ static int decode_frame(AVCodecContext *avctx, void *data,
if ((count = *dp++) <= 127) {
count++;
dlen -= count + 1;
-if (pixptr_end - pixptr < count * planes)
+if (pixptr_end - pixptr < count * px_inc)
break;
if (ep - dp < count)
return AVERROR_INVALIDDATA;
while (count--) {
*pixptr = *dp++;
-pixptr += planes;
+pixptr += px_inc;
}
} else {
count = 257 - count;
-if (pixptr_end - pixptr < count * planes)
+if (pixptr_end - pixptr < count * px_inc)
break;
while (count--) {
*pixptr = *dp;
-pixptr += planes;
+pixptr += px_inc;
}
dp++;
dlen -= 2;
--
1.7.10.4
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] lavd/sdl2: add sdl alias
Signed-off-by: Josh de Kock
---
The --enable-sdl2 option is not being renamed because it's a fairly
big change and sdl2 is incompatible with sdl.
libavdevice/sdl2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavdevice/sdl2.c b/libavdevice/sdl2.c
index 217ccc0..5d9e91e 100644
--- a/libavdevice/sdl2.c
+++ b/libavdevice/sdl2.c
@@ -352,7 +352,7 @@ static const AVClass sdl2_class = {
};
AVOutputFormat ff_sdl2_muxer = {
-.name = "sdl2",
+.name = "sdl,sdl2",
.long_name = NULL_IF_CONFIG_SMALL("SDL2 output device"),
.priv_data_size = sizeof(SDLContext),
.audio_codec= AV_CODEC_ID_NONE,
--
2.8.4 (Apple Git-73)
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] lavd/sdl2: rename user-facing names to sdl
On Sun, Sep 25, 2016 at 12:55:24PM +0100, Josh de Kock wrote:
> Signed-off-by: Josh de Kock
> ---
> configure | 2 +-
> libavdevice/sdl2.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index f593191..4cfd840 100755
> --- a/configure
> +++ b/configure
> @@ -291,7 +291,7 @@ External library support:
> if gnutls is not used [no]
>--disable-schannel disable SChannel SSP, needed for TLS support on
> Windows if openssl and gnutls are not used
> [autodetect]
> - --disable-sdl2 disable sdl2 [autodetect]
> + --disable-sdldisable sdl2 [autodetect]
>--disable-securetransport disable Secure Transport, needed for TLS support
> on OSX if openssl and gnutls are not used
> [autodetect]
>--enable-x11grab enable X11 grabbing (legacy) [no]
> diff --git a/libavdevice/sdl2.c b/libavdevice/sdl2.c
> index 217ccc0..efc587c 100644
> --- a/libavdevice/sdl2.c
> +++ b/libavdevice/sdl2.c
> @@ -352,7 +352,7 @@ static const AVClass sdl2_class = {
> };
>
> AVOutputFormat ff_sdl2_muxer = {
> -.name = "sdl2",
> +.name = "sdl",
> .long_name = NULL_IF_CONFIG_SMALL("SDL2 output device"),
> .priv_data_size = sizeof(SDLContext),
> .audio_codec= AV_CODEC_ID_NONE,
IIRC you can have aliases; with name = "sdl,sdl2". We do that for
v4l2,video4linux2 iirc
--
Clément B.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] lavd/sdl2: rename user-facing names to sdl
On 25/09/2016 12:55, Josh de Kock wrote:
Signed-off-by: Josh de Kock
---
configure | 2 +-
libavdevice/sdl2.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index f593191..4cfd840 100755
--- a/configure
+++ b/configure
@@ -291,7 +291,7 @@ External library support:
if gnutls is not used [no]
--disable-schannel disable SChannel SSP, needed for TLS support on
Windows if openssl and gnutls are not used
[autodetect]
- --disable-sdl2 disable sdl2 [autodetect]
+ --disable-sdldisable sdl2 [autodetect]
--disable-securetransport disable Secure Transport, needed for TLS support
on OSX if openssl and gnutls are not used
[autodetect]
--enable-x11grab enable X11 grabbing (legacy) [no]
diff --git a/libavdevice/sdl2.c b/libavdevice/sdl2.c
index 217ccc0..efc587c 100644
--- a/libavdevice/sdl2.c
+++ b/libavdevice/sdl2.c
@@ -352,7 +352,7 @@ static const AVClass sdl2_class = {
};
AVOutputFormat ff_sdl2_muxer = {
-.name = "sdl2",
+.name = "sdl",
.long_name = NULL_IF_CONFIG_SMALL("SDL2 output device"),
.priv_data_size = sizeof(SDLContext),
.audio_codec= AV_CODEC_ID_NONE,
err. Forgot to do all the changes.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] lavd/sdl2: rename user-facing names to sdl
Signed-off-by: Josh de Kock
---
configure | 2 +-
libavdevice/sdl2.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index f593191..4cfd840 100755
--- a/configure
+++ b/configure
@@ -291,7 +291,7 @@ External library support:
if gnutls is not used [no]
--disable-schannel disable SChannel SSP, needed for TLS support on
Windows if openssl and gnutls are not used
[autodetect]
- --disable-sdl2 disable sdl2 [autodetect]
+ --disable-sdldisable sdl2 [autodetect]
--disable-securetransport disable Secure Transport, needed for TLS support
on OSX if openssl and gnutls are not used
[autodetect]
--enable-x11grab enable X11 grabbing (legacy) [no]
diff --git a/libavdevice/sdl2.c b/libavdevice/sdl2.c
index 217ccc0..efc587c 100644
--- a/libavdevice/sdl2.c
+++ b/libavdevice/sdl2.c
@@ -352,7 +352,7 @@ static const AVClass sdl2_class = {
};
AVOutputFormat ff_sdl2_muxer = {
-.name = "sdl2",
+.name = "sdl",
.long_name = NULL_IF_CONFIG_SMALL("SDL2 output device"),
.priv_data_size = sizeof(SDLContext),
.audio_codec= AV_CODEC_ID_NONE,
--
2.8.4 (Apple Git-73)
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v2] avcodec: fix vc1dsp dependencies
[...] Patch applied. Thank you, Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH v2] avcodec: fix vc1dsp dependencies
--- libavcodec/aarch64/Makefile | 2 +- libavcodec/aarch64/h264cmc_neon.S | 2 +- libavcodec/arm/h264cmc_neon.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile index 36d9d34..c3df887 100644 --- a/libavcodec/aarch64/Makefile +++ b/libavcodec/aarch64/Makefile @@ -14,7 +14,7 @@ OBJS-$(CONFIG_VIDEODSP) += aarch64/videodsp_init.o # decoders/encoders OBJS-$(CONFIG_DCA_DECODER) += aarch64/synth_filter_init.o OBJS-$(CONFIG_RV40_DECODER) += aarch64/rv40dsp_init_aarch64.o -OBJS-$(CONFIG_VC1_DECODER) += aarch64/vc1dsp_init_aarch64.o +OBJS-$(CONFIG_VC1DSP) += aarch64/vc1dsp_init_aarch64.o OBJS-$(CONFIG_VORBIS_DECODER) += aarch64/vorbisdsp_init.o # ARMv8 optimizations diff --git a/libavcodec/aarch64/h264cmc_neon.S b/libavcodec/aarch64/h264cmc_neon.S index 486079f..ff97a29 100644 --- a/libavcodec/aarch64/h264cmc_neon.S +++ b/libavcodec/aarch64/h264cmc_neon.S @@ -445,7 +445,7 @@ endconst h264_chroma_mc4 avg, rv40 #endif -#if CONFIG_VC1_DECODER +#if CONFIG_VC1DSP h264_chroma_mc8 put, vc1 h264_chroma_mc8 avg, vc1 h264_chroma_mc4 put, vc1 diff --git a/libavcodec/arm/h264cmc_neon.S b/libavcodec/arm/h264cmc_neon.S index 77ed3c0..fc48a6f 100644 --- a/libavcodec/arm/h264cmc_neon.S +++ b/libavcodec/arm/h264cmc_neon.S @@ -455,7 +455,7 @@ endconst h264_chroma_mc4 avg, rv40 #endif -#if CONFIG_VC1_DECODER +#if CONFIG_VC1DSP h264_chroma_mc8 put, vc1 h264_chroma_mc8 avg, vc1 h264_chroma_mc4 put, vc1 -- 2.9.3 ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 0/5] Add SDL2 support & drop SDL1 support
2016-09-25 5:59 GMT+02:00 James Almer : > As Lukas suggested in another email, it would be a good idea > to keep using "sdl" instead of "sdl2" on things like the outdev > name and the configure option (--enable/disable-sdl). So > basically, anything an user could interact with. If this gets changed, please change it quickly. (+1) Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] avcodec: fix vc1dsp dependencies
2016-09-25 8:20 GMT+02:00 Xiaolei Yu : > --- > libavcodec/aarch64/Makefile | 2 +- > libavcodec/aarch64/h264cmc_neon.S | 2 +- > libavcodec/arm/h264cmc_neon.S | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile > index 36d9d34..c3df887 100644 > --- a/libavcodec/aarch64/Makefile > +++ b/libavcodec/aarch64/Makefile > @@ -14,7 +14,7 @@ OBJS-$(CONFIG_VIDEODSP) += > aarch64/videodsp_init.o There is a linebreak here that makes committing this difficult, please resend as attachment. Thank you, Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
