Changeset c832bf0c in ffmpeg

Timestamp:

Mar 6, 2014, 1:04:18 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

bba7b6fc

Parents:

636273d3 (diff), 2475fdbd (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (03/06/14 01:04:15)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/06/14 01:04:18)

Message:

Merge remote-tracking branch 'lukaszmluki/master'

• lukaszmluki/master: lavd/avdevice: always free detected devices on error lavf/http: return error from seek on invalid whence lavf/http: return error on seeking to negative postion lavf/avio: fix ffurl_alloc error checks

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)