ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-21 22:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a'

Browse Source 
* commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a':
  lavc doxy: remove false statements about alignment requirements.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-13 08:07:58 +02:00
commit 29d64b1d8e
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/avcodec.h
View File

@ -3792,9 +3792,6 @@ attribute_deprecated int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *s
* larger than the actual read bytes because some optimized bitstream * larger than the actual read bytes because some optimized bitstream
* readers read 32 or 64 bits at once and could read over the end. * readers read 32 or 64 bits at once and could read over the end.
* *
* @note You might have to align the input buffer. The alignment requirements
* depend on the CPU and the decoder.
*
* @param avctx the codec context * @param avctx the codec context
* @param[out] frame The AVFrame in which to store decoded audio samples. * @param[out] frame The AVFrame in which to store decoded audio samples.
* The decoder will allocate a buffer for the decoded frame by * The decoder will allocate a buffer for the decoded frame by
@ -3832,13 +3829,6 @@ int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame,
* @warning The end of the input buffer buf should be set to 0 to ensure that * @warning The end of the input buffer buf should be set to 0 to ensure that
* no overreading happens for damaged MPEG streams. * no overreading happens for damaged MPEG streams.
* *
* @note You might have to align the input buffer avpkt->data.
* The alignment requirements depend on the CPU: on some CPUs it isn't
* necessary at all, on others it won't work at all if not aligned and on others
* it will work but it will have an impact on performance.
*
* In practice, avpkt->data should have 4 byte alignment at minimum.
*
* @note Codecs which have the CODEC_CAP_DELAY capability set have a delay * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
* between input and output, these need to be fed with avpkt->data=NULL, * between input and output, these need to be fed with avpkt->data=NULL,
* avpkt->size=0 at the end to return the remaining frames. * avpkt->size=0 at the end to return the remaining frames.