summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2011-09-07 22:52:06 -0400
committerJustin Ruggles <justin.ruggles@gmail.com>2011-09-23 20:54:29 -0400
commit9ff6d0791b220d80844b45c9217113306a50a6cc (patch)
treefc2eb18492dd8d479f3deeed279998a2a11eccfd
parentb304244b54611e9a84e22ab40e94be4a7a474c21 (diff)
downloadffmpeg-streaming-9ff6d0791b220d80844b45c9217113306a50a6cc.zip
ffmpeg-streaming-9ff6d0791b220d80844b45c9217113306a50a6cc.tar.gz
adpcmenc: Set bits_per_coded_sample
-rw-r--r--libavcodec/adpcmenc.c2
-rw-r--r--libavcodec/utils.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c
index 6295eed..2a117f4 100644
--- a/libavcodec/adpcmenc.c
+++ b/libavcodec/adpcmenc.c
@@ -86,6 +86,8 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx)
FF_ALLOC_OR_GOTO(avctx, s->trellis_hash, 65536 * sizeof(*s->trellis_hash), error);
}
+ avctx->bits_per_coded_sample = av_get_bits_per_sample(avctx->codec->id);
+
switch(avctx->codec->id) {
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 */
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 9f198cb..8459e5f 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1121,6 +1121,8 @@ int av_get_bits_per_sample(enum CodecID codec_id){
case CODEC_ID_ADPCM_SBPRO_4:
case CODEC_ID_ADPCM_CT:
case CODEC_ID_ADPCM_IMA_WAV:
+ case CODEC_ID_ADPCM_IMA_QT:
+ case CODEC_ID_ADPCM_SWF:
case CODEC_ID_ADPCM_MS:
case CODEC_ID_ADPCM_YAMAHA:
return 4;
OpenPOWER on IntegriCloud