diff options
| -rw-r--r-- | libavcodec/g722enc.c | 4 | ||||
| -rw-r--r-- | libavcodec/utils.c | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c index bdc30d5d07..f8db49aba8 100644 --- a/libavcodec/g722enc.c +++ b/libavcodec/g722enc.c @@ -139,7 +139,7 @@ static int g722_encode_trellis(AVCodecContext *avctx, nodes[i][0]->state = c->band[i]; } - for (i = 0; i < buf_size >> 1; i++) { + for (i = 0; i < buf_size; i++) { int xlow, xhigh; struct TrellisNode *next[2]; int heap_pos[2] = {0, 0}; @@ -285,7 +285,7 @@ static int g722_encode_frame(AVCodecContext *avctx, if (avctx->trellis) return g722_encode_trellis(avctx, dst, buf_size, data); - for (i = 0; i < buf_size >> 1; i++) { + for (i = 0; i < buf_size; i++) { int xlow, xhigh, ihigh, ilow; filter_samples(c, &samples[2*i], &xlow, &xhigh); ihigh = encode_high(&c->band[1], xhigh); diff --git a/libavcodec/utils.c b/libavcodec/utils.c index c84439972c..04909cf959 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1342,8 +1342,8 @@ int av_get_bits_per_sample(enum CodecID codec_id){ case CODEC_ID_ADPCM_SWF: case CODEC_ID_ADPCM_MS: case CODEC_ID_ADPCM_YAMAHA: - return 4; case CODEC_ID_ADPCM_G722: + return 4; case CODEC_ID_PCM_ALAW: case CODEC_ID_PCM_MULAW: case CODEC_ID_PCM_S8: diff --git a/libavcodec/version.h b/libavcodec/version.h index 6faf793ea1..3918b139da 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -21,7 +21,7 @@ #define AVCODEC_VERSION_H #define LIBAVCODEC_VERSION_MAJOR 53 -#define LIBAVCODEC_VERSION_MINOR 25 +#define LIBAVCODEC_VERSION_MINOR 26 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |