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

more factoriztaion and a FIXME note 

Originally committed as revision 6636 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-10-10 23:56:49 +00:00
parent d84fd5d153
commit b49638928b
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/amr.c
View File

@ -91,6 +91,11 @@ static int amr_read_header(AVFormatContext *s,
get_buffer(pb, header, 6);
st = av_new_stream(s, 0);
if (!st)
{
return AVERROR_NOMEM;
}
if(memcmp(header,AMR_header,6)!=0)
{
get_buffer(pb, header+6, 3);
@ -98,11 +103,6 @@ static int amr_read_header(AVFormatContext *s,
{
return -1;
}
st = av_new_stream(s, 0);
if (!st)
{
return AVERROR_NOMEM;
}
st->codec->codec_tag = MKTAG('s', 'a', 'w', 'b');
st->codec->codec_id = CODEC_ID_AMR_WB;
@ -110,12 +110,6 @@ static int amr_read_header(AVFormatContext *s,
}
else
{
st = av_new_stream(s, 0);
if (!st)
{
return AVERROR_NOMEM;
}
st->codec->codec_tag = MKTAG('s', 'a', 'm', 'r');
st->codec->codec_id = CODEC_ID_AMR_NB;
st->codec->sample_rate = 8000;
@ -140,6 +134,7 @@ static int amr_read_packet(AVFormatContext *s,
return AVERROR_IO;
}
//FIXME this is wrong, this should rather be in a AVParset
toc=get_byte(&s->pb);
mode = (toc >> 3) & 0x0F;