diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 17:48:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 17:48:45 +0100 |
| commit | 15b2ec57ccaee49e8ec6de93d0ad7055da282e4d (patch) | |
| tree | 28f51a97013c69fa1b1e3e5559a0bb5cfe4ec4b1 /libavcodec/ffv1dec.c | |
| parent | 1d19f1b196c70cf2bd17d486e833bfa257314ef0 (diff) | |
| parent | be4edda6731a341d3fdeaa0e57753dc396790362 (diff) | |
| download | ffmpeg-15b2ec57ccaee49e8ec6de93d0ad7055da282e4d.tar.gz | |
Merge commit 'be4edda6731a341d3fdeaa0e57753dc396790362'
* commit 'be4edda6731a341d3fdeaa0e57753dc396790362':
http: Expose the content location via an AVOption
Conflicts:
libavformat/http.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1dec.c')
0 files changed, 0 insertions, 0 deletions