[FFmpeg-cvslog] Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a'

Michael Niedermayer git at videolan.org
Wed May 1 17:30:56 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  1 14:35:02 2013 +0200| [4818388e6c219bf48fa93bf76ee6ab3dc3fb1e8f] | committer: Michael Niedermayer

Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a'

* commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a':
  avconv: make output -ss insert trim/atrim filters.

Conflicts:
	Changelog
	ffmpeg.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4818388e6c219bf48fa93bf76ee6ab3dc3fb1e8f
---





More information about the ffmpeg-cvslog mailing list