Commit b95319a2 authored by Baptiste Coudurier's avatar Baptiste Coudurier

move amr parameters adjusting like other codecs

Originally committed as revision 6071 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 25be48eb
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment