Merge commit '2ec33d27127251bbc45e1f88e60691ad59cf2319'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 03:12:04 +0000 (04:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 03:12:30 +0000 (04:12 +0100)
commit76a939d0e58c256d5a340c8a7776eba2c83ff6d2
tree94b6d5640d0de41f57ab01cd71247a230543c3bd
parentf36da16ede525fb4925ad3ec863f131bc6743540
parent2ec33d27127251bbc45e1f88e60691ad59cf2319
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@gmx.at>
doc/protocols.texi
libavformat/http.c