diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-15 09:34:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-15 09:34:27 +0200 |
| commit | 0a6ce255ab49094e90aa5c7c76c46e0dccd5708d (patch) | |
| tree | 75012f382b7366717939f22aec355e30adc138f0 /tests/fate/libavutil.mak | |
| parent | c35d29a9c8240b81f8b7e089356b30bb26f034b9 (diff) | |
| parent | 708b32b6f72c58ec1bf5fed6a227b3e48b971a05 (diff) | |
| download | ffmpeg-0a6ce255ab49094e90aa5c7c76c46e0dccd5708d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
http: Check the auth string contents and not only the pointer
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/libavutil.mak')
0 files changed, 0 insertions, 0 deletions