Revision 5c69a4fd libavcodec/adpcm.c

View differences:

libavcodec/adpcm.c
648 648
        }
649 649
        break;
650 650
    case CODEC_ID_ADPCM_IMA_DK4:
651
        if (buf_size > BLKSIZE) {
652
            if (avctx->block_align != 0)
653
                buf_size = avctx->block_align;
654
            else
655
                buf_size = BLKSIZE;
656
        }
651
        if (avctx->block_align != 0 && buf_size > avctx->block_align)
652
            buf_size = avctx->block_align;
653

  
657 654
        c->status[0].predictor = (src[0] | (src[1] << 8));
658 655
        c->status[0].step_index = src[2];
659 656
        src += 4;
......
687 684
        }
688 685
        break;
689 686
    case CODEC_ID_ADPCM_IMA_DK3:
690
        if (buf_size > BLKSIZE) {
691
            if (avctx->block_align != 0)
692
                buf_size = avctx->block_align;
693
            else
694
                buf_size = BLKSIZE;
695
        }
687
        if (avctx->block_align != 0 && buf_size > avctx->block_align)
688
            buf_size = avctx->block_align;
689

  
696 690
        c->status[0].predictor = (src[10] | (src[11] << 8));
697 691
        c->status[1].predictor = (src[12] | (src[13] << 8));
698 692
        c->status[0].step_index = src[14];

Also available in: Unified diff