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/avcodec.h | |
parent | e3a91c51f7136c1bfd96f71b177b693e08427880 (diff) | |
parent | 6173a8fe5d2c0dd490b102101ae5e283d41dfe87 (diff) | |
download | ffmpeg-streaming-f9cf14c8da2a6af4ee8524ca950f644a0b081866.zip ffmpeg-streaming-f9cf14c8da2a6af4ee8524ca950f644a0b081866.tar.gz |
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/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 3936d5e..8ee0814 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2249,7 +2249,13 @@ typedef struct AVCodecContext { /* 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; |