[FFmpeg-cvslog] Merge commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af'

Michael Niedermayer git at videolan.org
Mon Oct 14 01:41:55 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 14 00:37:01 2013 +0200| [6b1b63df85ffa020bb36ac8d444a83b755a1d86d] | committer: Michael Niedermayer

Merge commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af'

* commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af':
  http: Support auth method detection for POST

Conflicts:
	libavformat/version.h

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

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





More information about the ffmpeg-cvslog mailing list