mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-06-26 01:56:34 +08:00
merge amr wb case with amr nb and qcelp
Originally committed as revision 15399 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
@ -985,11 +985,9 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
|
|||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
/* no ifdef since parameters are always those */
|
/* no ifdef since parameters are always those */
|
||||||
case CODEC_ID_AMR_WB:
|
|
||||||
st->codec->channels= 1; /* really needed */
|
|
||||||
break;
|
|
||||||
case CODEC_ID_QCELP:
|
case CODEC_ID_QCELP:
|
||||||
case CODEC_ID_AMR_NB:
|
case CODEC_ID_AMR_NB:
|
||||||
|
case CODEC_ID_AMR_WB:
|
||||||
st->codec->frame_size= sc->samples_per_frame;
|
st->codec->frame_size= sc->samples_per_frame;
|
||||||
st->codec->channels= 1; /* really needed */
|
st->codec->channels= 1; /* really needed */
|
||||||
break;
|
break;
|
||||||
|
Reference in New Issue
Block a user