Michael Niedermayer
719fde47ca
Merge commit 'c68317ebbe4915035df0b08c23eea7a0b80ab881'
* commit 'c68317ebbe4915035df0b08c23eea7a0b80ab881': lavc: fix documentation for AVCodecContext.delay atrac3: return an error if extradata_size is not a specific known size lavc: use the correct API version guard macro for avcodec_encode_audio() Move Doxyfile into the doc/ subdirectory doxygen: Build Doxygen documentation in the doc/ subdirectory dfa: use av_memcpy_backptr() where previously impossible av_memcpy_backptr: Drop no longer necessary malloc padding Conflicts: .gitignore libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
FFmpeg README ------------- 1) Documentation ---------------- * Read the documentation in the doc/ directory in git. You can also view it online at http://ffmpeg.org/documentation.html 2) Licensing ------------ * See the LICENSE file. 3) Build and Install -------------------- * See the INSTALL file.
Description
Languages
C
92.1%
Assembly
6%
Makefile
1.2%
C++
0.3%
Objective-C
0.2%
Other
0.1%