diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-01-24 11:46:58 -0500 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-01-24 14:13:47 -0500 |
| commit | b8dd555c63ca4ef1034006159b01f49e103c6252 (patch) | |
| tree | def2033e95e38963dcb56eb851247b9335536749 /libavformat/westwood_aud.c | |
| parent | be14a37066cc99e2b769ee5e044a34caecd24938 (diff) | |
| download | ffmpeg-b8dd555c63ca4ef1034006159b01f49e103c6252.tar.gz | |
aud: remove unneeded field, audio_stream_index from context
There is only one stream, so it will always be index 0.
This also allows for removal of the private context.
Diffstat (limited to 'libavformat/westwood_aud.c')
| -rw-r--r-- | libavformat/westwood_aud.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libavformat/westwood_aud.c b/libavformat/westwood_aud.c index 2195accbc8..f083a86baf 100644 --- a/libavformat/westwood_aud.c +++ b/libavformat/westwood_aud.c @@ -41,10 +41,6 @@ #define AUD_CHUNK_PREAMBLE_SIZE 8 #define AUD_CHUNK_SIGNATURE 0x0000DEAF -typedef struct WsAudDemuxContext { - int audio_stream_index; -} WsAudDemuxContext; - static int wsaud_probe(AVProbeData *p) { int field; @@ -88,7 +84,6 @@ static int wsaud_probe(AVProbeData *p) static int wsaud_read_header(AVFormatContext *s, AVFormatParameters *ap) { - WsAudDemuxContext *wsaud = s->priv_data; AVIOContext *pb = s->pb; AVStream *st; unsigned char header[AUD_HEADER_SIZE]; @@ -128,20 +123,17 @@ static int wsaud_read_header(AVFormatContext *s, st->codec->channels = channels; st->codec->sample_rate = sample_rate; - wsaud->audio_stream_index = st->index; - return 0; } static int wsaud_read_packet(AVFormatContext *s, AVPacket *pkt) { - WsAudDemuxContext *wsaud = s->priv_data; AVIOContext *pb = s->pb; unsigned char preamble[AUD_CHUNK_PREAMBLE_SIZE]; unsigned int chunk_size; int ret = 0; - AVStream *st = s->streams[wsaud->audio_stream_index]; + AVStream *st = s->streams[0]; if (avio_read(pb, preamble, AUD_CHUNK_PREAMBLE_SIZE) != AUD_CHUNK_PREAMBLE_SIZE) @@ -183,7 +175,6 @@ static int wsaud_read_packet(AVFormatContext *s, AVInputFormat ff_wsaud_demuxer = { .name = "wsaud", .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios audio format"), - .priv_data_size = sizeof(WsAudDemuxContext), .read_probe = wsaud_probe, .read_header = wsaud_read_header, .read_packet = wsaud_read_packet, |