diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-22 14:50:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-22 14:50:06 +0200 |
| commit | f9cf14c8da2a6af4ee8524ca950f644a0b081866 (patch) | |
| tree | b87fd82ec4c91d3be18780896fd3b4a1778408e9 /libavcodec/alac.c | |
| parent | e3a91c51f7136c1bfd96f71b177b693e08427880 (diff) | |
| parent | 6173a8fe5d2c0dd490b102101ae5e283d41dfe87 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
riff: remove a write-only variable
lavc: extend frame_size doxy.
alacdec: set bits_per_raw_sample
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/alac.c')
| -rw-r--r-- | libavcodec/alac.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/alac.c b/libavcodec/alac.c index 9cd17374a8..5653e9aff5 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -621,6 +621,7 @@ static av_cold int alac_decode_init(AVCodecContext * avctx) alac->sample_size); return AVERROR_PATCHWELCOME; } + avctx->bits_per_raw_sample = alac->sample_size; if (alac->channels < 1) { av_log(avctx, AV_LOG_WARNING, "Invalid channel count\n"); |