har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2012-10-22 14:50:00 +02:00
commit f9cf14c8da
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/alac.c
View File

@ -621,6 +621,7 @@ static av_cold int alac_decode_init(AVCodecContext * avctx)
alac->sample_size); alac->sample_size);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
avctx->bits_per_raw_sample = alac->sample_size;
if (alac->channels < 1) { if (alac->channels < 1) {
av_log(avctx, AV_LOG_WARNING, "Invalid channel count\n"); av_log(avctx, AV_LOG_WARNING, "Invalid channel count\n");

8
libavcodec/avcodec.h
View File

@ -2249,7 +2249,13 @@ typedef struct AVCodecContext {
/* The following data should not be initialized. */ /* The following data should not be initialized. */
/** /**
* Samples per packet, initialized when calling 'init'. * Number of samples per channel in an audio frame.
*
* - encoding: set by libavcodec in avcodec_open2(). Each submitted frame
* except the last must contain exactly frame_size samples per channel.
* May be 0 when the codec has CODEC_CAP_VARIABLE_FRAME_SIZE set, then the
* frame size is not restricted.
* - decoding: may be set by some decoders to indicate constant frame size
*/ */
int frame_size; int frame_size;