mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-29 22:00:58 +02:00
Michael Niedermayer
7f92f3d812
Merge remote-tracking branch 'qatar/master'
* qatar/master: h264: fix frame reordering code. fate: Add a test for the VBLE decoder doc: break some long lines in developer.texi drawtext: make x and y parametric drawtext: manage memory allocation better drawtext: refactor draw_text doc: remove space between variable and post increment in example code Conflicts: doc/developer.texi doc/filters.texi libavcodec/h264.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
FFmpeg README ------------- 1) Documentation ---------------- * Read the documentation in the doc/ directory. 2) Licensing ------------ * See the LICENSE file.
Languages
C
90.3%
Assembly
7.8%
Makefile
1.3%
C++
0.2%
Objective-C
0.2%
Other
0.1%