diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 14:48:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 14:48:28 +0200 |
| commit | 3bc5aa65bbcf79e869461a557bea356a66e0e77e (patch) | |
| tree | 1ccca145cbe227a3eb18d798a1ab2af3bf497c72 /libavutil/sha.c | |
| parent | da1dfea07670d450653c6d36442f80d7614c9fb3 (diff) | |
| parent | 40c7613ecf2f3f7565309f9780183228605c3684 (diff) | |
| download | ffmpeg-3bc5aa65bbcf79e869461a557bea356a66e0e77e.tar.gz | |
Merge commit '40c7613ecf2f3f7565309f9780183228605c3684' into release/2.2
* commit '40c7613ecf2f3f7565309f9780183228605c3684':
doc: Fix syntax and logical errors in avconv stream combination example
Conflicts:
doc/ffmpeg.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/sha.c')
0 files changed, 0 insertions, 0 deletions