[FFmpeg-cvslog] r20279 - trunk/libavformat/wv.c

[kostya]

Author: kostya
Date: Sun Oct 18 17:28:53 2009
New Revision: 20279

Log:
Read metadata in WavPack files.
Patch by Anton Khirnov (acronym("What You Should Know About Something"), gmail)

Modified:
   trunk/libavformat/wv.c

Modified: trunk/libavformat/wv.c
==============================================================================
--- trunk/libavformat/wv.c	Sun Oct 18 16:34:45 2009	(r20278)
+++ trunk/libavformat/wv.c	Sun Oct 18 17:28:53 2009	(r20279)
@@ -21,6 +21,8 @@
 
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
+#include "apetag.h"
+#include "id3v1.h"
 
 // specs say that maximum block size is 1Mb
 #define WV_BLOCK_LIMIT 1047576
@@ -146,6 +148,15 @@ static int wv_read_header(AVFormatContex
     av_set_pts_info(st, 64, 1, wc->rate);
     s->start_time = 0;
     s->duration = (int64_t)wc->samples * AV_TIME_BASE / st->codec->sample_rate;
+
+    if(!url_is_streamed(s->pb)) {
+        int64_t cur = url_ftell(s->pb);
+        ff_ape_parse_tag(s);
+        if(!av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX))
+            ff_id3v1_read(s);
+        url_fseek(s->pb, cur, SEEK_SET);
+    }
+
     return 0;
 }