7aeb281aa5078726eef5f7db0e7b513932454dc0

(cherry picked from commit 9e5e2c2d01
)
Conflicts:
libavcodec/shorten.c
FFmpeg README ------------- 1) Documentation ---------------- * Read the documentation in the doc/ directory. 2) Licensing ------------ * See the LICENSE file.
Description
Languages
C
92.1%
Assembly
6%
Makefile
1.2%
C++
0.3%
Objective-C
0.2%
Other
0.1%