[FFmpeg-cvslog] Merge commit '2ec33d27127251bbc45e1f88e60691ad59cf2319'
Michael Niedermayer
git at videolan.org
Wed Mar 12 04:28:29 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 12 04:12:04 2014 +0100| [76a939d0e58c256d5a340c8a7776eba2c83ff6d2] | committer: Michael Niedermayer
Merge commit '2ec33d27127251bbc45e1f88e60691ad59cf2319'
* commit '2ec33d27127251bbc45e1f88e60691ad59cf2319':
http: Add support for selecting a request range
Conflicts:
doc/protocols.texi
libavformat/http.c
See: d52882faef368264f9fe5a595274ec84d3446132
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76a939d0e58c256d5a340c8a7776eba2c83ff6d2
---
More information about the ffmpeg-cvslog
mailing list