[FFmpeg-cvslog] Merge commit '36ac9a16a19a365ce58cc871484c20cffe9b6401'

Michael Niedermayer git at videolan.org
Thu Oct 18 11:46:03 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 18 11:42:42 2012 +0200| [9317b73f11c34e550a2ffcf01540824dbaa36036] | committer: Michael Niedermayer

Merge commit '36ac9a16a19a365ce58cc871484c20cffe9b6401'

* commit '36ac9a16a19a365ce58cc871484c20cffe9b6401':
  fate: dependencies for seek tests
  fate: handle lavf test dependencies entirely in make

Conflicts:
	configure
	tests/Makefile

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

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





More information about the ffmpeg-cvslog mailing list