[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

Michael Niedermayer git at videolan.org
Tue Dec 11 08:38:40 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec 11 08:24:45 2012 +0100| [9696ad6a76534b16dfaf9872dd20017f9f8d18e4] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: fix 'clean' target
  ZeroCodec: Flip output

Conflicts:
	libavcodec/version.h

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

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





More information about the ffmpeg-cvslog mailing list