diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-17 23:45:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-17 23:45:00 +0200 |
| commit | de2cfb744a207cc09bc961c859d7ae91cb6192b4 (patch) | |
| tree | 0a78680e2bcacd76b6b16b2d39005f74aa76ae05 /libavcodec | |
| parent | 847943bc51098dbd68301099ed132cdde0f9eabf (diff) | |
| parent | 7d7b40f48a05af4483b31cdb8b4f1808b97b1f2f (diff) | |
| download | ffmpeg-de2cfb744a207cc09bc961c859d7ae91cb6192b4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pcmenc: set correct bitrate value
avprobe: don't print format entry name when only one was requested
Conflicts:
ffprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/pcm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index da2adea66a..c72b2003c4 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -48,6 +48,7 @@ static av_cold int pcm_encode_init(AVCodecContext *avctx) avctx->bits_per_coded_sample = av_get_bits_per_sample(avctx->codec->id); avctx->block_align = avctx->channels * avctx->bits_per_coded_sample / 8; + avctx->bit_rate = avctx->block_align * avctx->sample_rate * 8; avctx->coded_frame = avcodec_alloc_frame(); if (!avctx->coded_frame) return AVERROR(ENOMEM); |