diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-08-24 09:53:53 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-08-24 09:53:53 +0000 |
| commit | b95319a2f2708ae1a805acbf5f4c32f6d820dfa0 (patch) | |
| tree | 76fdeadb1b2b7b9fe4af6fb9a7fa9ace81ffb68b | |
| parent | 25be48eb486e93728d495bb68b624a349616c367 (diff) | |
move amr parameters adjusting like other codecs
Originally committed as revision 6071 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/mov.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 1b8ef293a6..e234ef707d 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -978,14 +978,6 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) if (st->codec->bits_per_sample == 8) st->codec->codec_id = CODEC_ID_PCM_S8; break; - case CODEC_ID_AMR_WB: - st->codec->sample_rate = 16000; /* should really we ? */ - st->codec->channels=1; /* really needed */ - break; - case CODEC_ID_AMR_NB: - st->codec->sample_rate = 8000; /* should really we ? */ - st->codec->channels=1; /* really needed */ - break; default: break; } @@ -1064,6 +1056,15 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) st->codec->codec_id = CODEC_ID_PCM_S16LE; break; #endif + /* no ifdef since parameters are always those */ + case CODEC_ID_AMR_WB: + st->codec->sample_rate= 16000; + st->codec->channels= 1; /* really needed */ + break; + case CODEC_ID_AMR_NB: + st->codec->sample_rate= 8000; + st->codec->channels= 1; /* really needed */ + break; default: break; } |