diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-06-26 22:55:39 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-06-26 22:55:39 +0000 |
| commit | ad9c10556c5ed9eb17d8412c1414048fdfe5fc44 (patch) | |
| tree | 0681c46251a71db47583dff1e1839c7093cbe4d8 /libavformat/psxstr.c | |
| parent | a4fe6826de5925020cd2c06a0f2f84b8bf3430da (diff) | |
merge decl & init
Originally committed as revision 14001 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/psxstr.c')
| -rw-r--r-- | libavformat/psxstr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index f460ed3141..7f5fe797c0 100644 --- a/libavformat/psxstr.c +++ b/libavformat/psxstr.c @@ -202,7 +202,7 @@ static int str_read_packet(AVFormatContext *s, case CDXA_TYPE_AUDIO: if(str->channels[channel].audio_stream_index < 0){ - int fmt; + int fmt = sector[0x13]; /* allocate a new AVStream */ st = av_new_stream(s, 0); if (!st) @@ -210,7 +210,6 @@ static int str_read_packet(AVFormatContext *s, str->channels[channel].audio_stream_index = st->index; - fmt = sector[0x13]; st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_id = CODEC_ID_ADPCM_XA; st->codec->codec_tag = 0; /* no fourcc */ |