diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 04:12:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 04:12:30 +0100 |
| commit | 76a939d0e58c256d5a340c8a7776eba2c83ff6d2 (patch) | |
| tree | 94b6d5640d0de41f57ab01cd71247a230543c3bd /common.mak | |
| parent | f36da16ede525fb4925ad3ec863f131bc6743540 (diff) | |
| parent | 2ec33d27127251bbc45e1f88e60691ad59cf2319 (diff) | |
| download | ffmpeg-76a939d0e58c256d5a340c8a7776eba2c83ff6d2.tar.gz | |
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>
Diffstat (limited to 'common.mak')
0 files changed, 0 insertions, 0 deletions