ffmpeg.c · ed7f1a5c207636c80795e683d7808411d3c7ab3e · libremedia / Tethys / FFmpeg

11 years ago

Michael Niedermayer authored 11 years ago


* commit '2ce8bca5':
  avconv: print a warning when falling back to default 25fps

Conflicts:
	ffmpeg.c

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

206c06d9

History

Merge commit ''

Michael Niedermayer authored 11 years ago


* commit '2ce8bca5':
  avconv: print a warning when falling back to default 25fps

Conflicts:
	ffmpeg.c

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