71d008ebe4f96974433eecfd3575bc82eb4b06a8
* commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a':
avcodec: Deprecate dtg_active_format field in favor of avframe side-data
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/mpeg12dec.c
libavcodec/version.h
libavfilter/vf_showinfo.c
libavutil/frame.h
libavutil/version.h
See: 2a3c36e920
Merged-by: Michael Niedermayer <michaelni@gmx.at>
FFmpeg README
- Documentation
-
Read the documentation in the doc/ directory in git.
You can also view it online at http://ffmpeg.org/documentation.html
- Licensing
- See the LICENSE file.
- 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%