[FFmpeg-cvslog] Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201'

Michael Niedermayer git at videolan.org
Wed Mar 13 12:28:14 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 12:21:43 2013 +0100| [1c60956c80376884502e797f613ec24cacba3cce] | committer: Michael Niedermayer

Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201'

* commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201':
  lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft

Conflicts:
	libavformat/allformats.c
	libavformat/version.h

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

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





More information about the ffmpeg-cvslog mailing list