mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2026-05-16 08:38:24 +02:00
2265212396c1126ee4b21cc038a2bc7eab16e60a
* commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32':
mxf: Introduce ff_mxf_get_samples_per_frame
Conflicts:
libavformat/mxf.c
libavformat/mxf.h
See: 906a263813
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.
Languages
C
89.3%
Assembly
8.3%
Makefile
1.4%
C++
0.3%
GLSL
0.3%
Other
0.2%