[FFmpeg-cvslog] commit: Factor tag reading code out of wav read_header() ( Michael Niedermayer )

[git at videolan.org]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 15 17:13:30 2011 +0000| [724b1f6a05dbbc75df70990469fe521b93a098de] | committer: Michael Niedermayer 

Factor tag reading code out of wav read_header()

Originally committed as revision 26369 to svn://svn.ffmpeg.org/ffmpeg/trunk

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=724b1f6a05dbbc75df70990469fe521b93a098de
---

 libavformat/wav.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/libavformat/wav.c b/libavformat/wav.c
index 903bc72..7cb2429 100644
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -140,6 +140,13 @@ AVOutputFormat wav_muxer = {
 
 
 #if CONFIG_WAV_DEMUXER
+
+static int64_t next_tag(ByteIOContext *pb, unsigned int *tag)
+{
+    *tag = get_le32(pb);
+    return get_le32(pb);
+}
+
 /* return the size of the found tag */
 static int64_t find_tag(ByteIOContext *pb, uint32_t tag1)
 {
@@ -149,8 +156,7 @@ static int64_t find_tag(ByteIOContext *pb, uint32_t tag1)
     for (;;) {
         if (url_feof(pb))
             return -1;
-        tag  = get_le32(pb);
-        size = get_le32(pb);
+        size = next_tag(pb, &tag);
         if (tag == tag1)
             break;
         url_fseek(pb, size, SEEK_CUR);