| Message ID | 20201106231017.2741118-1-tfoucu@gmail.com |
|---|---|
| State | Accepted |
| Commit | 1c57b8ae3bf7d5e07a4951f80f9d5d3c50c4a74b |
| Headers | show |
| Series | [FFmpeg-devel] libavformat/avidec: Extract more metadata from the header | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
On Fri, Nov 06, 2020 at 03:10:17PM -0800, Thierry Foucu wrote: > --- > libavformat/avidec.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) will apply thx [...]
Quoting Thierry Foucu (2020-11-07 00:10:17) > --- > libavformat/avidec.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/libavformat/avidec.c b/libavformat/avidec.c > index 578cf68ce1..7e527e15ee 100644 > --- a/libavformat/avidec.c > +++ b/libavformat/avidec.c > @@ -110,6 +110,15 @@ static const char avi_headers[][8] = { > > static const AVMetadataConv avi_metadata_conv[] = { > { "strn", "title" }, > + { "isbj", "subject" }, > + { "inam", "title" }, > + { "iart", "artist" }, > + { "icop", "copyright" }, > + { "icmt", "comment" }, > + { "ignr", "genre" }, > + { "iprd", "product" }, > + { "isft", "software" }, > + This seems duplicated with ff_riff_info_conv.
On Wed, Nov 11, 2020 at 7:39 AM Anton Khirnov <anton@khirnov.net> wrote: > Quoting Thierry Foucu (2020-11-07 00:10:17) > > --- > > libavformat/avidec.c | 17 +++++++++++++++++ > > 1 file changed, 17 insertions(+) > > > > diff --git a/libavformat/avidec.c b/libavformat/avidec.c > > index 578cf68ce1..7e527e15ee 100644 > > --- a/libavformat/avidec.c > > +++ b/libavformat/avidec.c > > @@ -110,6 +110,15 @@ static const char avi_headers[][8] = { > > > > static const AVMetadataConv avi_metadata_conv[] = { > > { "strn", "title" }, > > + { "isbj", "subject" }, > > + { "inam", "title" }, > > + { "iart", "artist" }, > > + { "icop", "copyright" }, > > + { "icmt", "comment" }, > > + { "ignr", "genre" }, > > + { "iprd", "product" }, > > + { "isft", "software" }, > > + > > This seems duplicated with ff_riff_info_conv. > Thanks for pointing this out. I will send a Patch to remove them > > -- > Anton Khirnov > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 578cf68ce1..7e527e15ee 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -110,6 +110,15 @@ static const char avi_headers[][8] = { static const AVMetadataConv avi_metadata_conv[] = { { "strn", "title" }, + { "isbj", "subject" }, + { "inam", "title" }, + { "iart", "artist" }, + { "icop", "copyright" }, + { "icmt", "comment" }, + { "ignr", "genre" }, + { "iprd", "product" }, + { "isft", "software" }, + { 0 }, }; @@ -979,6 +988,14 @@ static int avi_read_header(AVFormatContext *s) avio_skip(pb, size); break; case MKTAG('s', 't', 'r', 'n'): + case MKTAG('i', 's', 'b', 'j'): + case MKTAG('i', 'n', 'a', 'm'): + case MKTAG('i', 'a', 'r', 't'): + case MKTAG('i', 'c', 'o', 'p'): + case MKTAG('i', 'c', 'm', 't'): + case MKTAG('i', 'g', 'n', 'r'): + case MKTAG('i', 'p', 'o', 'd'): + case MKTAG('i', 's', 'o', 'f'): if (s->nb_streams) { ret = avi_read_tag(s, s->streams[s->nb_streams - 1], tag, size); if (ret < 0)