[FFmpeg-cvslog] Merge commit '29f1fa74225e9fdbab6d590857edbecb51cf74da'

Michael Niedermayer git at videolan.org
Thu Jan 31 20:02:38 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 31 19:52:58 2013 +0100| [01d012ba3db91d555b6905d21afcb232150b9ecf] | committer: Michael Niedermayer

Merge commit '29f1fa74225e9fdbab6d590857edbecb51cf74da'

* commit '29f1fa74225e9fdbab6d590857edbecb51cf74da':
  configure: Move newlib libc check before mingw libc check
  avisynth: Change demuxer name to avoid conflicts with AVS

Conflicts:
	configure

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

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





More information about the ffmpeg-cvslog mailing list