diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 08:07:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 08:09:28 +0200 |
| commit | 29d64b1d8ebe78bf4f57a127b954cc3f0aec8f84 (patch) | |
| tree | 94b7af6803bec33e8654a4bbd80a3da68871d111 | |
| parent | b35ef855a4fa6d8839f42f4836813bc0050adf96 (diff) | |
| parent | 66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a (diff) | |
| download | ffmpeg-29d64b1d8ebe78bf4f57a127b954cc3f0aec8f84.tar.gz | |
Merge commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a'
* commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a':
lavc doxy: remove false statements about alignment requirements.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/avcodec.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index b632e686d5..756b356ced 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -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 * 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[out] frame The AVFrame in which to store decoded audio samples. * 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 * 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 * between input and output, these need to be fed with avpkt->data=NULL, * avpkt->size=0 at the end to return the remaining frames. |