diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 10:13:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 10:38:04 +0200 |
| commit | 689a1bd917d528c9a84cc1a998159eb31e98ea79 (patch) | |
| tree | 7a474e55e80820495774eebe852cd637d2baba14 /libavformat/concat.c | |
| parent | e6e71fd7b563329aba1d72c1238b824295ab20c1 (diff) | |
| parent | 5c53bf7aaf03748464cbf978bffe7ffdb71112b1 (diff) | |
| download | ffmpeg-689a1bd917d528c9a84cc1a998159eb31e98ea79.tar.gz | |
Merge commit '5c53bf7aaf03748464cbf978bffe7ffdb71112b1'
* commit '5c53bf7aaf03748464cbf978bffe7ffdb71112b1':
http: Pass options through to the nested protocol
Conflicts:
libavformat/http.c
See: b6f435fbc87c024f8403fca69e6e6b98bccf93fa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/concat.c')
0 files changed, 0 insertions, 0 deletions