diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-01-23 11:06:35 -0500 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-01-24 14:08:29 -0500 |
| commit | 9ae846971fc1dd1dff5cac9b8f26cff499e053c5 (patch) | |
| tree | c2ae3e55aa767a975f618dba92270e7a41364d5a | |
| parent | 53ed79a260099c761f8a74872d695a2aeb7a0ced (diff) | |
| download | ffmpeg-9ae846971fc1dd1dff5cac9b8f26cff499e053c5.tar.gz | |
vqa: set packet duration.
Also remove unused context field, audio_frame_counter.
| -rw-r--r-- | libavformat/westwood_vqa.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavformat/westwood_vqa.c b/libavformat/westwood_vqa.c index fef6877944..9a4826340c 100644 --- a/libavformat/westwood_vqa.c +++ b/libavformat/westwood_vqa.c @@ -61,8 +61,6 @@ typedef struct WsVqaDemuxContext { int audio_stream_index; int video_stream_index; - - int64_t audio_frame_counter; } WsVqaDemuxContext; static int wsvqa_probe(AVProbeData *p) @@ -144,7 +142,6 @@ static int wsvqa_read_header(AVFormatContext *s, wsvqa->audio_stream_index = st->index; wsvqa->audio_samplerate = st->codec->sample_rate; wsvqa->audio_channels = st->codec->channels; - wsvqa->audio_frame_counter = 0; } /* there are 0 or more chunks before the FINF chunk; iterate until @@ -216,13 +213,14 @@ static int wsvqa_read_packet(AVFormatContext *s, if (chunk_type == SND2_TAG) { pkt->stream_index = wsvqa->audio_stream_index; /* 2 samples/byte, 1 or 2 samples per frame depending on stereo */ - wsvqa->audio_frame_counter += (chunk_size * 2) / wsvqa->audio_channels; + pkt->duration = (chunk_size * 2) / wsvqa->audio_channels; } else if(chunk_type == SND1_TAG) { pkt->stream_index = wsvqa->audio_stream_index; /* unpacked size is stored in header */ - wsvqa->audio_frame_counter += AV_RL16(pkt->data) / wsvqa->audio_channels; + pkt->duration = AV_RL16(pkt->data) / wsvqa->audio_channels; } else { pkt->stream_index = wsvqa->video_stream_index; + pkt->duration = 1; } /* stay on 16-bit alignment */ if (skip_byte) |