OSDN Git Service

Merge remote-tracking branch 'lukaszmluki/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 01:04:15 +0000 (02:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 01:04:18 +0000 (02:04 +0100)
* 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>
1  2 
libavformat/http.c

Simple merge