[FFmpeg-cvslog] westwooddemuxer: use av_get_packet()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 15 20:27:51 2011 +0100| [4255d6d96cb80fd411c858d424626f60b97f52ac] | committer: Michael Niedermayer

westwooddemuxer: use av_get_packet()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/westwood.c |    8 ++------
 tests/ref/fate/vqa-cc  |    1 +
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/libavformat/westwood.c b/libavformat/westwood.c
index 5632650..c232d5c 100644
--- a/libavformat/westwood.c
+++ b/libavformat/westwood.c
@@ -333,13 +333,9 @@ static int wsvqa_read_packet(AVFormatContext *s,
 
         if ((chunk_type == SND1_TAG) || (chunk_type == SND2_TAG) || (chunk_type == VQFR_TAG)) {
 
-            if (av_new_packet(pkt, chunk_size))
+            ret= av_get_packet(pb, pkt, chunk_size);
+            if (ret<0)
                 return AVERROR(EIO);
-            ret = avio_read(pb, pkt->data, chunk_size);
-            if (ret != chunk_size) {
-                av_free_packet(pkt);
-                return AVERROR(EIO);
-            }
 
             if (chunk_type == SND2_TAG) {
                 pkt->stream_index = wsvqa->audio_stream_index;
diff --git a/tests/ref/fate/vqa-cc b/tests/ref/fate/vqa-cc
index e15e727..fdc7e72 100644
--- a/tests/ref/fate/vqa-cc
+++ b/tests/ref/fate/vqa-cc
@@ -68,6 +68,7 @@
 1, 218996, 2940, 0xac8bb6c8
 0, 222000, 192000, 0xb58c1566
 1, 224996, 2940, 0xa503c73b
+0, 228000, 192000, 0xb58c1566
 1, 230996, 2940, 0x7cd588a3
 1, 236996, 2940, 0xa6974b04
 1, 242996, 2940, 0xbf448241