summaryrefslogtreecommitdiff
path: root/libavformat/amr.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2010-09-03 14:59:18 +0000
committerMartin Storsjö <martin@martin.st>2010-09-03 14:59:18 +0000
commit8bb90c539456fa588499fc8b03fbcc07b5317443 (patch)
treeb43caf9b13765564e475a6f841c75c512d601897 /libavformat/amr.c
parent744a882f6ca012edfcdc188092582b73921f99c3 (diff)
Set frame_size in the amr demuxer
Originally committed as revision 25030 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/amr.c')
-rw-r--r--libavformat/amr.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/amr.c b/libavformat/amr.c
index d16b4c03cd..f78aacc216 100644
--- a/libavformat/amr.c
+++ b/libavformat/amr.c
@@ -100,12 +100,14 @@ static int amr_read_header(AVFormatContext *s,
st->codec->codec_tag = MKTAG('s', 'a', 'w', 'b');
st->codec->codec_id = CODEC_ID_AMR_WB;
st->codec->sample_rate = 16000;
+ st->codec->frame_size = 320;
}
else
{
st->codec->codec_tag = MKTAG('s', 'a', 'm', 'r');
st->codec->codec_id = CODEC_ID_AMR_NB;
st->codec->sample_rate = 8000;
+ st->codec->frame_size = 160;
}
st->codec->channels = 1;
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;