OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 636273d 2475fdb)
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)
commitc832bf0c38a36698684971eca5f779d115b01976
tree7f1d3016035c77fbcd7b71ca7d22697ab4d6d6batree | snapshot
parent636273d3d4a8c42f51832e8bf83e566e875916bfcommit | diff
parent2475fdbd047d8956b03f1bfb1e3f896985fd8c7fcommit | diff
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>
libavformat/http.c diff1 | diff2 | blob | history
external/ffmpeg
About OSDN
Find Software
Develop Software
Help