[FFmpeg-cvslog] Merge commit '2eaa3663fda750dac66d41fe8541a8744d5563a4'

Michael Niedermayer git at videolan.org
Wed Mar 13 01:39:41 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 01:31:46 2013 +0100| [b94df21a5164c7f1591935deccc13f85d8c43717] | committer: Michael Niedermayer

Merge commit '2eaa3663fda750dac66d41fe8541a8744d5563a4'

* commit '2eaa3663fda750dac66d41fe8541a8744d5563a4':
  avplay: enable only when SDL 1.2 is found

Conflicts:
	configure

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

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





More information about the ffmpeg-cvslog mailing list