diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 03:38:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 03:38:30 +0100 |
| commit | bcc25353cf259ee63df4c2147630259cd90c8cd5 (patch) | |
| tree | c34ff544bf152c2cd1a3eeecd6885fc5483e8b52 /libavformat/data_uri.c | |
| parent | 6a10263f163af66f9e143cb0ba206cb99e78e605 (diff) | |
| parent | 991e6fa35b4ad2df389ba7e1c2c58d064e295c76 (diff) | |
| download | ffmpeg-bcc25353cf259ee63df4c2147630259cd90c8cd5.tar.gz | |
Merge commit '991e6fa35b4ad2df389ba7e1c2c58d064e295c76' into release/2.2
* commit '991e6fa35b4ad2df389ba7e1c2c58d064e295c76':
http: Add support for selecting a request range
Conflicts:
doc/protocols.texi
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/data_uri.c')
0 files changed, 0 insertions, 0 deletions