diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-11 01:26:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-11 01:27:38 +0200 |
| commit | 5e3da256184e13502b3428f94e180888436d157b (patch) | |
| tree | f7fe7878be400b38b909f9862bd3b0392b62e24c /ffmpeg_filter.c | |
| parent | 3e56ae67d300f0eed2b9040fcc7c5e3229f0cde1 (diff) | |
| parent | 775a0b04f0cf8102fe322b2ee03fe1a0633dea04 (diff) | |
Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'
* commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04':
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 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions