mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-13 21:28:01 +02:00
remove unreachable code
Originally committed as revision 10896 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
0137034996
commit
c33ed2aaf9
@ -158,11 +158,6 @@ static int adpcm_encode_init(AVCodecContext *avctx)
|
|||||||
if (avctx->channels > 2)
|
if (avctx->channels > 2)
|
||||||
return -1; /* only stereo or mono =) */
|
return -1; /* only stereo or mono =) */
|
||||||
switch(avctx->codec->id) {
|
switch(avctx->codec->id) {
|
||||||
case CODEC_ID_ADPCM_IMA_QT:
|
|
||||||
av_log(avctx, AV_LOG_ERROR, "ADPCM: codec adpcm_ima_qt unsupported for encoding !\n");
|
|
||||||
avctx->frame_size = 64; /* XXX: can multiple of avctx->channels * 64 (left and right blocks are interleaved) */
|
|
||||||
return -1;
|
|
||||||
break;
|
|
||||||
case CODEC_ID_ADPCM_IMA_WAV:
|
case CODEC_ID_ADPCM_IMA_WAV:
|
||||||
avctx->frame_size = (BLKSIZE - 4 * avctx->channels) * 8 / (4 * avctx->channels) + 1; /* each 16 bits sample gives one nibble */
|
avctx->frame_size = (BLKSIZE - 4 * avctx->channels) * 8 / (4 * avctx->channels) + 1; /* each 16 bits sample gives one nibble */
|
||||||
/* and we have 4 bytes per channel overhead */
|
/* and we have 4 bytes per channel overhead */
|
||||||
@ -446,8 +441,6 @@ static int adpcm_encode_frame(AVCodecContext *avctx,
|
|||||||
/* n = (BLKSIZE - 4 * avctx->channels) / (2 * 8 * avctx->channels); */
|
/* n = (BLKSIZE - 4 * avctx->channels) / (2 * 8 * avctx->channels); */
|
||||||
|
|
||||||
switch(avctx->codec->id) {
|
switch(avctx->codec->id) {
|
||||||
case CODEC_ID_ADPCM_IMA_QT: /* XXX: can't test until we get .mov writer */
|
|
||||||
break;
|
|
||||||
case CODEC_ID_ADPCM_IMA_WAV:
|
case CODEC_ID_ADPCM_IMA_WAV:
|
||||||
n = avctx->frame_size / 8;
|
n = avctx->frame_size / 8;
|
||||||
c->status[0].prev_sample = (signed short)samples[0]; /* XXX */
|
c->status[0].prev_sample = (signed short)samples[0]; /* XXX */
|
||||||
|
Loading…
Reference in New Issue
Block a user