git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
744a882
)
Set frame_size in the amr demuxer
author
Martin Storsjö
<martin@martin.st>
Fri, 3 Sep 2010 14:59:18 +0000
(14:59 +0000)
committer
Martin Storsjö
<martin@martin.st>
Fri, 3 Sep 2010 14:59:18 +0000
(14:59 +0000)
Originally committed as revision 25030 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/amr.c
patch
|
blob
|
history
diff --git
a/libavformat/amr.c
b/libavformat/amr.c
index
d16b4c0
..
f78aacc
100644
(file)
--- 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;