1946ad4d8c089fcdd8aa82b0cd25e52d4443c1b7

* commit '121b5b7e0476d22408d748b914799b7c00acc3a4': isom: add some BOXX tags isom: add 'flic' tag isom: add 'm1v ' tag Conflicts: libavformat/isom.c See:ca8623e1a5
See:8a3f976498
See:fca62f0500
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%