RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Justin Ruggles 2012-01-24 11:46:58 -05:00
parent be14a37066
commit b8dd555c63
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/westwood_aud.c
View File

@ -41,10 +41,6 @@
#define AUD_CHUNK_PREAMBLE_SIZE 8 #define AUD_CHUNK_PREAMBLE_SIZE 8
#define AUD_CHUNK_SIGNATURE 0x0000DEAF #define AUD_CHUNK_SIGNATURE 0x0000DEAF
typedef struct WsAudDemuxContext {
int audio_stream_index;
} WsAudDemuxContext;
static int wsaud_probe(AVProbeData *p) static int wsaud_probe(AVProbeData *p)
{ {
int field; int field;
@ -88,7 +84,6 @@ static int wsaud_probe(AVProbeData *p)
static int wsaud_read_header(AVFormatContext *s, static int wsaud_read_header(AVFormatContext *s,
AVFormatParameters *ap) AVFormatParameters *ap)
{ {
WsAudDemuxContext *wsaud = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVStream *st; AVStream *st;
unsigned char header[AUD_HEADER_SIZE]; unsigned char header[AUD_HEADER_SIZE];
@ -128,20 +123,17 @@ static int wsaud_read_header(AVFormatContext *s,
st->codec->channels = channels; st->codec->channels = channels;
st->codec->sample_rate = sample_rate; st->codec->sample_rate = sample_rate;
wsaud->audio_stream_index = st->index;
return 0; return 0;
} }
static int wsaud_read_packet(AVFormatContext *s, static int wsaud_read_packet(AVFormatContext *s,
AVPacket *pkt) AVPacket *pkt)
{ {
WsAudDemuxContext *wsaud = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
unsigned char preamble[AUD_CHUNK_PREAMBLE_SIZE]; unsigned char preamble[AUD_CHUNK_PREAMBLE_SIZE];
unsigned int chunk_size; unsigned int chunk_size;
int ret = 0; 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) != if (avio_read(pb, preamble, AUD_CHUNK_PREAMBLE_SIZE) !=
AUD_CHUNK_PREAMBLE_SIZE) AUD_CHUNK_PREAMBLE_SIZE)
@ -183,7 +175,6 @@ static int wsaud_read_packet(AVFormatContext *s,
AVInputFormat ff_wsaud_demuxer = { AVInputFormat ff_wsaud_demuxer = {
.name = "wsaud", .name = "wsaud",
.long_name = NULL_IF_CONFIG_SMALL("Westwood Studios audio format"), .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios audio format"),
.priv_data_size = sizeof(WsAudDemuxContext),
.read_probe = wsaud_probe, .read_probe = wsaud_probe,
.read_header = wsaud_read_header, .read_header = wsaud_read_header,
.read_packet = wsaud_read_packet, .read_packet = wsaud_read_packet,