| Message ID | CAB0OVGq7rOK+zjT=91QgWuL0qpW1kQaMciKyG1DEPorkW4Ftvg@mail.gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
2017-03-01 23:43 GMT+01:00 Carl Eugen Hoyos <ceffmpeg@gmail.com>: > 2017-03-01 13:07 GMT+01:00 Michael Niedermayer <michael@niedermayer.cc>: >> On Wed, Mar 01, 2017 at 09:43:57AM +0100, Carl Eugen Hoyos wrote: >>> 2017-03-01 4:40 GMT+01:00 Michael Niedermayer <michael@niedermayer.cc>: >>> > On Tue, Feb 28, 2017 at 08:45:44PM +0100, Carl Eugen Hoyos wrote: >>> >> Hi! >>> >> >>> >> Attached patch fixes ticket #6206 here. >>> >> >>> >> Please comment, Carl Eugen >>> > >>> > previous ffmpeg versions dont play these files >>> >>> What do you suggest? >> >> support this at the demuxer side, backport such support then >> wait till its supported widely before switching the default in the >> muxer > > Agree, new patch attached. Ping. Carl Eugen
On Wed, Mar 01, 2017 at 11:43:15PM +0100, Carl Eugen Hoyos wrote: > 2017-03-01 13:07 GMT+01:00 Michael Niedermayer <michael@niedermayer.cc>: > > On Wed, Mar 01, 2017 at 09:43:57AM +0100, Carl Eugen Hoyos wrote: > >> 2017-03-01 4:40 GMT+01:00 Michael Niedermayer <michael@niedermayer.cc>: > >> > On Tue, Feb 28, 2017 at 08:45:44PM +0100, Carl Eugen Hoyos wrote: > >> >> Hi! > >> >> > >> >> Attached patch fixes ticket #6206 here. > >> >> > >> >> Please comment, Carl Eugen > >> > > >> > previous ffmpeg versions dont play these files > >> > >> What do you suggest? > > > > support this at the demuxer side, backport such support then > > wait till its supported widely before switching the default in the > > muxer > > Agree, new patch attached. > > Thank you, Carl Eugen > matroska.c | 1 + > matroskaenc.c | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > f1f3a3f2c331db2bc7c9ccf2c9d9fad42b3c9467 0001-lavf-matroska-Support-codec-ID-V_FFV1-for-demuxing.patch > From 5b50e8409463b746e38b35f7ca82c6b54b3be9ee Mon Sep 17 00:00:00 2001 > From: Carl Eugen Hoyos <cehoyos@ag.or.at> > Date: Wed, 1 Mar 2017 23:40:35 +0100 > Subject: [PATCH] lavf/matroska: Support codec ID V_FFV1 for demuxing. > > Fixes ticket #6206. > --- > libavformat/matroska.c | 1 + > libavformat/matroskaenc.c | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) should be ok [...]
2017-03-03 0:31 GMT+01:00 Michael Niedermayer <michael@niedermayer.cc>: > On Wed, Mar 01, 2017 at 11:43:15PM +0100, Carl Eugen Hoyos wrote: >> Subject: [PATCH] lavf/matroska: Support codec ID V_FFV1 for demuxing. >> >> Fixes ticket #6206. >> --- >> libavformat/matroska.c | 1 + >> libavformat/matroskaenc.c | 2 +- >> 2 files changed, 2 insertions(+), 1 deletion(-) > > should be ok Patch applied, vlc ticket #18085 created. Carl Eugen
From 5b50e8409463b746e38b35f7ca82c6b54b3be9ee Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos <cehoyos@ag.or.at> Date: Wed, 1 Mar 2017 23:40:35 +0100 Subject: [PATCH] lavf/matroska: Support codec ID V_FFV1 for demuxing. Fixes ticket #6206. --- libavformat/matroska.c | 1 + libavformat/matroskaenc.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index fda96fb..7905fd1 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -77,6 +77,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"S_HDMV/TEXTST" , AV_CODEC_ID_HDMV_TEXT_SUBTITLE}, {"V_DIRAC" , AV_CODEC_ID_DIRAC}, + {"V_FFV1" , AV_CODEC_ID_FFV1}, {"V_MJPEG" , AV_CODEC_ID_MJPEG}, {"V_MPEG1" , AV_CODEC_ID_MPEG1VIDEO}, {"V_MPEG2" , AV_CODEC_ID_MPEG2VIDEO}, diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 7cb8893..1622b44 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1138,7 +1138,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, // if none are found, use AVI codes if (par->codec_id != AV_CODEC_ID_RAWVIDEO || par->codec_tag) { for (j = 0; ff_mkv_codec_tags[j].id != AV_CODEC_ID_NONE; j++) { - if (ff_mkv_codec_tags[j].id == par->codec_id) { + if (ff_mkv_codec_tags[j].id == par->codec_id && par->codec_id != AV_CODEC_ID_FFV1) { put_ebml_string(pb, MATROSKA_ID_CODECID, ff_mkv_codec_tags[j].str); native_id = 1; break; -- 1.7.10.4