generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support streaming .au files.

Browse Source 
FFmpeg writes data_size as AU_UNKNOWN_SIZE, make demuxer not
fail when data_size is set to this value.
Should fix trac issue #394.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2011-08-13 12:06:09 +02:00
parent ca1dfea127
commit eb8b325202
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/au.c
View File

@ -134,7 +134,7 @@ static int au_read_header(AVFormatContext *s,
size = avio_rb32(pb); /* header size */ size = avio_rb32(pb); /* header size */
data_size = avio_rb32(pb); /* data size in bytes */ data_size = avio_rb32(pb); /* data size in bytes */
if (data_size < 0) { if (data_size < 0 && data_size != AU_UNKNOWN_SIZE) {
av_log(s, AV_LOG_ERROR, "Invalid negative data size '%d' found\n", data_size); av_log(s, AV_LOG_ERROR, "Invalid negative data size '%d' found\n", data_size);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@ -164,6 +164,7 @@ static int au_read_header(AVFormatContext *s,
st->codec->codec_id = codec; st->codec->codec_id = codec;
st->codec->channels = channels; st->codec->channels = channels;
st->codec->sample_rate = rate; st->codec->sample_rate = rate;
if (data_size != AU_UNKNOWN_SIZE)
st->duration = (((int64_t)data_size)<<3) / (st->codec->channels * bps); st->duration = (((int64_t)data_size)<<3) / (st->codec->channels * bps);
av_set_pts_info(st, 64, 1, rate); av_set_pts_info(st, 64, 1, rate);
return 0; return 0;