virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

merge decl & init

Browse Source 
Originally committed as revision 14001 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2008-06-26 22:55:39 +00:00
parent a4fe6826de
commit ad9c10556c
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/psxstr.c
View File

@ -202,7 +202,7 @@ static int str_read_packet(AVFormatContext *s,
case CDXA_TYPE_AUDIO: case CDXA_TYPE_AUDIO:
if(str->channels[channel].audio_stream_index < 0){ if(str->channels[channel].audio_stream_index < 0){
int fmt; int fmt = sector[0x13];
/* allocate a new AVStream */ /* allocate a new AVStream */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
@ -210,7 +210,6 @@ static int str_read_packet(AVFormatContext *s,
str->channels[channel].audio_stream_index = st->index; str->channels[channel].audio_stream_index = st->index;
fmt = sector[0x13];
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_ADPCM_XA; st->codec->codec_id = CODEC_ID_ADPCM_XA;
st->codec->codec_tag = 0; /* no fourcc */ st->codec->codec_tag = 0; /* no fourcc */