Browse Source

westwooddemuxer: use av_get_packet()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n0.10
Michael Niedermayer 14 years ago
parent
commit
4255d6d96c
2 changed files with 3 additions and 6 deletions
  1. +2
    -6
      libavformat/westwood.c
  2. +1
    -0
      tests/ref/fate/vqa-cc

+ 2
- 6
libavformat/westwood.c View File

@@ -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;


+ 1
- 0
tests/ref/fate/vqa-cc View File

@@ -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


Loading…
Cancel
Save