[FFmpeg-cvslog] Merge commit '3b2d0ec473b036bdd0a5bc0d896fd5292915f44d'

Michael Niedermayer git at videolan.org
Wed Mar 27 11:39:24 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 27 11:32:45 2013 +0100| [ef8ab2f953079106bb4d72f9ce0af9c38f919130] | committer: Michael Niedermayer

Merge commit '3b2d0ec473b036bdd0a5bc0d896fd5292915f44d'

* commit '3b2d0ec473b036bdd0a5bc0d896fd5292915f44d':
  configure: Remove the mpegvideo dependency from svq1
  x86: vc1dsp: Fix indentation

Conflicts:
	configure

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

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





More information about the ffmpeg-cvslog mailing list