aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPanagiotis Issaris <takis.issaris@uhasselt.be>2006-09-07 08:09:15 +0000
committerGuillaume Poirier <gpoirier@mplayerhq.hu>2006-09-07 08:09:15 +0000
commitf0861f466f6b65ec4fbe9ff551a9b8a6adaff1f0 (patch)
treec47c388b940b8ea954a39b65b28138c9f172c57e
parent7ff0b84f0e4844a9452c5c59aeb28edb2caefc45 (diff)
downloadffmpeg-f0861f466f6b65ec4fbe9ff551a9b8a6adaff1f0.tar.gz
Better tag support:
- Make ffplay show comments and copyright info besides the current track, title, author, album, year and genre. - Makes the AVI demuxer parse the album name stores in the IPRD tag by the AVI muxer. Patch by takis P issaris A uhasselt P be Original thread: [Ffmpeg-devel] [PATCH] Better tag support Date: 09/06/06 16:58 Originally committed as revision 6186 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffplay.c4
-rw-r--r--libavformat/avidec.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/ffplay.c b/ffplay.c
index 77d4aaa983..be9972b262 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1755,6 +1755,10 @@ static void dump_stream_info(const AVFormatContext *s)
fprintf(stderr, "Title: %s\n", s->title);
if (s->author[0] != '\0')
fprintf(stderr, "Author: %s\n", s->author);
+ if (s->copyright[0] != '\0')
+ fprintf(stderr, "Copyright: %s\n", s->copyright);
+ if (s->comment[0] != '\0')
+ fprintf(stderr, "Comment: %s\n", s->comment);
if (s->album[0] != '\0')
fprintf(stderr, "Album: %s\n", s->album);
if (s->year != 0)
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 0e03365ede..bb4714f485 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -476,6 +476,9 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
case MKTAG('I', 'G', 'N', 'R'):
avi_read_tag(pb, s->genre, sizeof(s->genre), size);
break;
+ case MKTAG('I', 'P', 'R', 'D'):
+ avi_read_tag(pb, s->album, sizeof(s->album), size);
+ break;
default:
/* skip tag */
size += (size & 1);