| Message ID | 20200127103042.174-1-ffmpeg@gyani.pro |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [FFmpeg-devel] avformat/mov: update extensions | expand |
| Context | Check | Description |
|---|---|---|
| andriy/ffmpeg-patchwork | success | Make fate finished |
Am Mo., 27. Jan. 2020 um 11:31 Uhr schrieb Gyan Doshi <ffmpeg@gyani.pro>: > > Added all extensions used by the mov muxer family > --- > libavformat/mov.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/mov.c b/libavformat/mov.c > index 589576b529..21a5a0180e 100644 > --- a/libavformat/mov.c > +++ b/libavformat/mov.c > @@ -8073,7 +8073,7 @@ AVInputFormat ff_mov_demuxer = { > .long_name = NULL_IF_CONFIG_SMALL("QuickTime / MOV"), > .priv_class = &mov_class, > .priv_data_size = sizeof(MOVContext), > - .extensions = "mov,mp4,m4a,3gp,3g2,mj2", > + .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4v,m4b,ism,ismv,isma,f4v", Is this supposed to fix anything? I ask because iirc the demuxer does not work for files not detected or do I misremember? Carl Eugen
On 27-01-2020 09:04 pm, Carl Eugen Hoyos wrote: > Am Mo., 27. Jan. 2020 um 11:31 Uhr schrieb Gyan Doshi <ffmpeg@gyani.pro>: >> Added all extensions used by the mov muxer family >> --- >> libavformat/mov.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/libavformat/mov.c b/libavformat/mov.c >> index 589576b529..21a5a0180e 100644 >> --- a/libavformat/mov.c >> +++ b/libavformat/mov.c >> @@ -8073,7 +8073,7 @@ AVInputFormat ff_mov_demuxer = { >> .long_name = NULL_IF_CONFIG_SMALL("QuickTime / MOV"), >> .priv_class = &mov_class, >> .priv_data_size = sizeof(MOVContext), >> - .extensions = "mov,mp4,m4a,3gp,3g2,mj2", >> + .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4v,m4b,ism,ismv,isma,f4v", > Is this supposed to fix anything? > I ask because iirc the demuxer does not work for files not detected or do I > misremember? Keeping the list up to date. FATE passed. Do you have cases where this leads to a false positive? Primary motivation is to replace the unwieldy format short name with am actually short & representative string. I've locally added av_find_input_format2 which will look at extensions as well so that existing commands with `-f mp4` ..etc continue to work, Gyan
Am Mo., 27. Jan. 2020 um 17:10 Uhr schrieb Gyan <ffmpeg@gyani.pro>: > > > > On 27-01-2020 09:04 pm, Carl Eugen Hoyos wrote: > > Am Mo., 27. Jan. 2020 um 11:31 Uhr schrieb Gyan Doshi <ffmpeg@gyani.pro>: > >> Added all extensions used by the mov muxer family > >> --- > >> libavformat/mov.c | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/libavformat/mov.c b/libavformat/mov.c > >> index 589576b529..21a5a0180e 100644 > >> --- a/libavformat/mov.c > >> +++ b/libavformat/mov.c > >> @@ -8073,7 +8073,7 @@ AVInputFormat ff_mov_demuxer = { > >> .long_name = NULL_IF_CONFIG_SMALL("QuickTime / MOV"), > >> .priv_class = &mov_class, > >> .priv_data_size = sizeof(MOVContext), > >> - .extensions = "mov,mp4,m4a,3gp,3g2,mj2", > >> + .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4v,m4b,ism,ismv,isma,f4v", > > Is this supposed to fix anything? > > I ask because iirc the demuxer does not work for files not detected or do I > > misremember? > > Keeping the list up to date. I believe patches should at least theoretically fix issues but imo, feel free to remove extensions for this demuxer if it makes you feel better. At least the m4v suffix is not such a good idea. Carl Eugen
On 27-01-2020 09:55 pm, Carl Eugen Hoyos wrote: > Am Mo., 27. Jan. 2020 um 17:10 Uhr schrieb Gyan <ffmpeg@gyani.pro>: >> >> >> On 27-01-2020 09:04 pm, Carl Eugen Hoyos wrote: >>> Am Mo., 27. Jan. 2020 um 11:31 Uhr schrieb Gyan Doshi <ffmpeg@gyani.pro>: >>>> Added all extensions used by the mov muxer family >>>> --- >>>> libavformat/mov.c | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> diff --git a/libavformat/mov.c b/libavformat/mov.c >>>> index 589576b529..21a5a0180e 100644 >>>> --- a/libavformat/mov.c >>>> +++ b/libavformat/mov.c >>>> @@ -8073,7 +8073,7 @@ AVInputFormat ff_mov_demuxer = { >>>> .long_name = NULL_IF_CONFIG_SMALL("QuickTime / MOV"), >>>> .priv_class = &mov_class, >>>> .priv_data_size = sizeof(MOVContext), >>>> - .extensions = "mov,mp4,m4a,3gp,3g2,mj2", >>>> + .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4v,m4b,ism,ismv,isma,f4v", >>> Is this supposed to fix anything? >>> I ask because iirc the demuxer does not work for files not detected or do I >>> misremember? >> Keeping the list up to date. > I believe patches should at least theoretically fix issues but imo, feel free > to remove extensions for this demuxer if it makes you feel better. I'm *adding* extensions. > At least the m4v suffix is not such a good idea. What does it clash with? Raw MPEG-4 Part 2 bitstreams? Gyan
Am Mo., 27. Jan. 2020 um 17:50 Uhr schrieb Gyan <ffmpeg@gyani.pro>: > > > > On 27-01-2020 09:55 pm, Carl Eugen Hoyos wrote: > > Am Mo., 27. Jan. 2020 um 17:10 Uhr schrieb Gyan <ffmpeg@gyani.pro>: > >> > >> > >> On 27-01-2020 09:04 pm, Carl Eugen Hoyos wrote: > >>> Am Mo., 27. Jan. 2020 um 11:31 Uhr schrieb Gyan Doshi <ffmpeg@gyani.pro>: > >>>> Added all extensions used by the mov muxer family > >>>> --- > >>>> libavformat/mov.c | 2 +- > >>>> 1 file changed, 1 insertion(+), 1 deletion(-) > >>>> > >>>> diff --git a/libavformat/mov.c b/libavformat/mov.c > >>>> index 589576b529..21a5a0180e 100644 > >>>> --- a/libavformat/mov.c > >>>> +++ b/libavformat/mov.c > >>>> @@ -8073,7 +8073,7 @@ AVInputFormat ff_mov_demuxer = { > >>>> .long_name = NULL_IF_CONFIG_SMALL("QuickTime / MOV"), > >>>> .priv_class = &mov_class, > >>>> .priv_data_size = sizeof(MOVContext), > >>>> - .extensions = "mov,mp4,m4a,3gp,3g2,mj2", > >>>> + .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4v,m4b,ism,ismv,isma,f4v", > >>> Is this supposed to fix anything? > >>> I ask because iirc the demuxer does not work for files not detected or do I > >>> misremember? > >> Keeping the list up to date. > > I believe patches should at least theoretically fix issues but imo, feel free > > to remove extensions for this demuxer if it makes you feel better. > I'm *adding* extensions. Since you are not claiming to fix an issue (or a theoretical issue), I was assuming you don't like to have an incomplete-looking list in the file. If that is correct, removing it is an option, no? > > At least the m4v suffix is not such a good idea. > > What does it clash with? Raw MPEG-4 Part 2 bitstreams? Yes. Carl Eugen
On 27-01-2020 10:22 pm, Carl Eugen Hoyos wrote: > Am Mo., 27. Jan. 2020 um 17:50 Uhr schrieb Gyan <ffmpeg@gyani.pro>: >> >> >> On 27-01-2020 09:55 pm, Carl Eugen Hoyos wrote: >>> Am Mo., 27. Jan. 2020 um 17:10 Uhr schrieb Gyan <ffmpeg@gyani.pro>: >>>> >>>> On 27-01-2020 09:04 pm, Carl Eugen Hoyos wrote: >>>>> Am Mo., 27. Jan. 2020 um 11:31 Uhr schrieb Gyan Doshi <ffmpeg@gyani.pro>: >>>>>> Added all extensions used by the mov muxer family >>>>>> --- >>>>>> libavformat/mov.c | 2 +- >>>>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>>>> >>>>>> diff --git a/libavformat/mov.c b/libavformat/mov.c >>>>>> index 589576b529..21a5a0180e 100644 >>>>>> --- a/libavformat/mov.c >>>>>> +++ b/libavformat/mov.c >>>>>> @@ -8073,7 +8073,7 @@ AVInputFormat ff_mov_demuxer = { >>>>>> .long_name = NULL_IF_CONFIG_SMALL("QuickTime / MOV"), >>>>>> .priv_class = &mov_class, >>>>>> .priv_data_size = sizeof(MOVContext), >>>>>> - .extensions = "mov,mp4,m4a,3gp,3g2,mj2", >>>>>> + .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4v,m4b,ism,ismv,isma,f4v", >>>>> Is this supposed to fix anything? >>>>> I ask because iirc the demuxer does not work for files not detected or do I >>>>> misremember? >>>> Keeping the list up to date. >>> I believe patches should at least theoretically fix issues but imo, feel free >>> to remove extensions for this demuxer if it makes you feel better. >> I'm *adding* extensions. > Since you are not claiming to fix an issue (or a theoretical issue), I was > assuming you don't like to have an incomplete-looking list in the file. > If that is correct, removing it is an option, no? An empty list is even more incomplete. As I mentioned, the benefit is for cli users able to specify `-f ext` as well as `-h demuxer=ext` >>> At least the m4v suffix is not such a good idea. >> What does it clash with? Raw MPEG-4 Part 2 bitstreams? > Yes. Will remove. Gyan
Am Mo., 27. Jan. 2020 um 18:07 Uhr schrieb Gyan <ffmpeg@gyani.pro>: > > > > On 27-01-2020 10:22 pm, Carl Eugen Hoyos wrote: > > Am Mo., 27. Jan. 2020 um 17:50 Uhr schrieb Gyan <ffmpeg@gyani.pro>: > >> > >> > >> On 27-01-2020 09:55 pm, Carl Eugen Hoyos wrote: > >>> Am Mo., 27. Jan. 2020 um 17:10 Uhr schrieb Gyan <ffmpeg@gyani.pro>: > >>>> > >>>> On 27-01-2020 09:04 pm, Carl Eugen Hoyos wrote: > >>>>> Am Mo., 27. Jan. 2020 um 11:31 Uhr schrieb Gyan Doshi <ffmpeg@gyani.pro>: > >>>>>> Added all extensions used by the mov muxer family > >>>>>> --- > >>>>>> libavformat/mov.c | 2 +- > >>>>>> 1 file changed, 1 insertion(+), 1 deletion(-) > >>>>>> > >>>>>> diff --git a/libavformat/mov.c b/libavformat/mov.c > >>>>>> index 589576b529..21a5a0180e 100644 > >>>>>> --- a/libavformat/mov.c > >>>>>> +++ b/libavformat/mov.c > >>>>>> @@ -8073,7 +8073,7 @@ AVInputFormat ff_mov_demuxer = { > >>>>>> .long_name = NULL_IF_CONFIG_SMALL("QuickTime / MOV"), > >>>>>> .priv_class = &mov_class, > >>>>>> .priv_data_size = sizeof(MOVContext), > >>>>>> - .extensions = "mov,mp4,m4a,3gp,3g2,mj2", > >>>>>> + .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4v,m4b,ism,ismv,isma,f4v", > >>>>> Is this supposed to fix anything? > >>>>> I ask because iirc the demuxer does not work for files not detected or do I > >>>>> misremember? > >>>> Keeping the list up to date. > >>> I believe patches should at least theoretically fix issues but imo, feel free > >>> to remove extensions for this demuxer if it makes you feel better. > >> I'm *adding* extensions. > > Since you are not claiming to fix an issue (or a theoretical issue), I was > > assuming you don't like to have an incomplete-looking list in the file. > > If that is correct, removing it is an option, no? > An empty list is even more incomplete. > > As I mentioned, the benefit is for cli users able to specify `-f ext` > as well as `-h demuxer=ext` I understand now. > >>> At least the m4v suffix is not such a good idea. > >> What does it clash with? Raw MPEG-4 Part 2 bitstreams? > > Yes. > Will remove. Thank you, Carl Eugen
On 27-01-2020 10:40 pm, Carl Eugen Hoyos wrote: > Am Mo., 27. Jan. 2020 um 18:07 Uhr schrieb Gyan <ffmpeg@gyani.pro>: >> >> >> On 27-01-2020 10:22 pm, Carl Eugen Hoyos wrote: >>> Am Mo., 27. Jan. 2020 um 17:50 Uhr schrieb Gyan <ffmpeg@gyani.pro>: >>>> >>>> On 27-01-2020 09:55 pm, Carl Eugen Hoyos wrote: >>>>> Am Mo., 27. Jan. 2020 um 17:10 Uhr schrieb Gyan <ffmpeg@gyani.pro>: >>>>>> On 27-01-2020 09:04 pm, Carl Eugen Hoyos wrote: >>>>>>> Am Mo., 27. Jan. 2020 um 11:31 Uhr schrieb Gyan Doshi <ffmpeg@gyani.pro>: >>>>>>>> Added all extensions used by the mov muxer family >>>>>>>> --- >>>>>>>> libavformat/mov.c | 2 +- >>>>>>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>>>>>> >>>>>>>> diff --git a/libavformat/mov.c b/libavformat/mov.c >>>>>>>> index 589576b529..21a5a0180e 100644 >>>>>>>> --- a/libavformat/mov.c >>>>>>>> +++ b/libavformat/mov.c >>>>>>>> @@ -8073,7 +8073,7 @@ AVInputFormat ff_mov_demuxer = { >>>>>>>> .long_name = NULL_IF_CONFIG_SMALL("QuickTime / MOV"), >>>>>>>> .priv_class = &mov_class, >>>>>>>> .priv_data_size = sizeof(MOVContext), >>>>>>>> - .extensions = "mov,mp4,m4a,3gp,3g2,mj2", >>>>>>>> + .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4v,m4b,ism,ismv,isma,f4v", >>>>>>> Is this supposed to fix anything? >>>>>>> I ask because iirc the demuxer does not work for files not detected or do I >>>>>>> misremember? >>>>>> Keeping the list up to date. >>>>> I believe patches should at least theoretically fix issues but imo, feel free >>>>> to remove extensions for this demuxer if it makes you feel better. >>>> I'm *adding* extensions. >>> Since you are not claiming to fix an issue (or a theoretical issue), I was >>> assuming you don't like to have an incomplete-looking list in the file. >>> If that is correct, removing it is an option, no? >> An empty list is even more incomplete. >> >> As I mentioned, the benefit is for cli users able to specify `-f ext` >> as well as `-h demuxer=ext` > I understand now. > >>>>> At least the m4v suffix is not such a good idea. >>>> What does it clash with? Raw MPEG-4 Part 2 bitstreams? >>> Yes. >> Will remove. > Thank you, Carl Eugen Pushed as febd37f4bd9c8bb5290f1d72390e8228f7e02f30 Thanks, Gyan
Am Mo., 27. Jan. 2020 um 18:07 Uhr schrieb Gyan <ffmpeg@gyani.pro>: > As I mentioned, the benefit is for cli users able to specify `-f ext` > as well as `-h demuxer=ext` I cannot reproduce this... Carl Eugen
On 29-01-2020 05:52 am, Carl Eugen Hoyos wrote: > Am Mo., 27. Jan. 2020 um 18:07 Uhr schrieb Gyan <ffmpeg@gyani.pro>: > >> As I mentioned, the benefit is for cli users able to specify `-f ext` >> as well as `-h demuxer=ext` > I cannot reproduce this... That will depend on my patch that adds av_find_input_format2. I sent it yesterday. Gyan
Am Mi., 29. Jan. 2020 um 05:56 Uhr schrieb Gyan <ffmpeg@gyani.pro>: > > > > On 29-01-2020 05:52 am, Carl Eugen Hoyos wrote: > > Am Mo., 27. Jan. 2020 um 18:07 Uhr schrieb Gyan <ffmpeg@gyani.pro>: > > > >> As I mentioned, the benefit is for cli users able to specify `-f ext` > >> as well as `-h demuxer=ext` > > I cannot reproduce this... > > That will depend on my patch that adds av_find_input_format2. > I sent it yesterday. In this case it was not ok to commit the patch. Carl Eugen
On 30-01-2020 07:37 am, Carl Eugen Hoyos wrote: > Am Mi., 29. Jan. 2020 um 05:56 Uhr schrieb Gyan <ffmpeg@gyani.pro>: >> >> >> On 29-01-2020 05:52 am, Carl Eugen Hoyos wrote: >>> Am Mo., 27. Jan. 2020 um 18:07 Uhr schrieb Gyan <ffmpeg@gyani.pro>: >>> >>>> As I mentioned, the benefit is for cli users able to specify `-f ext` >>>> as well as `-h demuxer=ext` >>> I cannot reproduce this... >> That will depend on my patch that adds av_find_input_format2. >> I sent it yesterday. > In this case it was not ok to commit the patch. Why? What does it break? Gyan
diff --git a/libavformat/mov.c b/libavformat/mov.c index 589576b529..21a5a0180e 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -8073,7 +8073,7 @@ AVInputFormat ff_mov_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("QuickTime / MOV"), .priv_class = &mov_class, .priv_data_size = sizeof(MOVContext), - .extensions = "mov,mp4,m4a,3gp,3g2,mj2", + .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4v,m4b,ism,ismv,isma,f4v", .read_probe = mov_probe, .read_header = mov_read_header, .read_packet = mov_read_packet,