d1c359777f3ebccb7565043cd79347ab305758d8

* commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137':
lavc: do not use AVCodecContext.codec_name in avcodec_string()
Conflicts:
libavcodec/utils.c
See: d2d7b7134f
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%