Changeset 0a6ce255 in ffmpeg

Timestamp:

Oct 15, 2013, 7:34:27 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a1b9004b

Parents:

c35d29a9 (diff), 708b32b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)