3cd2c33d36cb5cfe64ca43295f9e592de753f244
* commit 'e7fdd6aa0d11c3e144988d7090f972224799e07f':
avconv: Use the mpeg12 private option scan_offset
Conflicts:
ffmpeg_opt.c
See: e479013ae4
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
89%
Assembly
8.4%
Makefile
1.4%
GLSL
0.4%
C++
0.3%
Other
0.3%