diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 21:54:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 21:54:41 +0100 |
| commit | 9ba0719244bf626e817e56c9aad0272ca55b0484 (patch) | |
| tree | 8cb8867550617190c4dfbc1bb8daec20051ad608 /libavutil/cpu.c | |
| parent | 8e37603ac9612448b9dbe64a9988e489d961caee (diff) | |
| parent | f661006f235fa58bc756610cdc76c662ac0fab5f (diff) | |
| download | ffmpeg-9ba0719244bf626e817e56c9aad0272ca55b0484.tar.gz | |
Merge commit 'f661006f235fa58bc756610cdc76c662ac0fab5f' into release/0.10
* commit 'f661006f235fa58bc756610cdc76c662ac0fab5f':
doc: Fix syntax and logical errors in avconv stream combination example
Conflicts:
doc/avconv.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/cpu.c')
0 files changed, 0 insertions, 0 deletions