doc/ffmpeg.texi · 5e3da256184e13502b3428f94e180888436d157b · libremedia / Tethys / FFmpeg

10 years ago

Michael Niedermayer authored 10 years ago


* commit '775a0b04':
  doc: Fix syntax and logical errors in avconv stream combination example

Conflicts:
	doc/ffmpeg.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>

5e3da256

History

Merge commit ''

Michael Niedermayer authored 10 years ago


* commit '775a0b04':
  doc: Fix syntax and logical errors in avconv stream combination example

Conflicts:
	doc/ffmpeg.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>