[FFmpeg-cvslog] Merge commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4'

Michael Niedermayer git at videolan.org
Wed Mar 12 04:51:49 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 12 04:41:48 2014 +0100| [0d487654ea8515d916f5d3b9e208fe39d9723fc5] | committer: Michael Niedermayer

Merge commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4'

* commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4':
  http: Improve options descriptions

Conflicts:
	doc/protocols.texi
	libavformat/http.c

See: 255ec768da6f6e821775888621da2156764598da
See: 0a7cd740438b46e3b9fbf406ca5a948a6f027c97
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list