RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-28 02:02:46 +00:00
Code Issues Projects Releases Wiki Activity

avformat/dsddec: create audio stream before processing id3

Browse Source 
This ensures stream[0] is always the audio stream (an assumption made
in dsf_read_packet).

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Peter Ross 2014-04-18 15:56:28 +10:00 committed by Michael Niedermayer
parent 941b2240f2
commit 0a13487b1a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/dsfdec.c
View File

@ -70,6 +70,11 @@ static int dsf_read_header(AVFormatContext *s)
if (avio_rl64(pb) != 28) if (avio_rl64(pb) != 28)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
/* create primary stream before any id3 coverart streams */
st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
avio_skip(pb, 8); avio_skip(pb, 8);
id3pos = avio_rl64(pb); id3pos = avio_rl64(pb);
if (pb->seekable) { if (pb->seekable) {
@ -92,10 +97,6 @@ static int dsf_read_header(AVFormatContext *s)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
channel_type = avio_rl32(pb); channel_type = avio_rl32(pb);
if (channel_type < FF_ARRAY_ELEMS(dsf_channel_layout)) if (channel_type < FF_ARRAY_ELEMS(dsf_channel_layout))
st->codec->channel_layout = dsf_channel_layout[channel_type]; st->codec->channel_layout = dsf_channel_layout[channel_type];