Merge commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 03:29:54 +0000 (04:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 03:29:54 +0000 (04:29 +0100)
commit1cc9468289b266e4a8ff62d520be832f103f0afa
tree9114befa21979cd4ffe0253152214ac01e3e17a8
parent76a939d0e58c256d5a340c8a7776eba2c83ff6d2
parentab76d9f628ad46e1d3bbf26c5bf1f87083f239ab
Merge commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab'

* commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab':
  http: Always allow no-op seek

Conflicts:
libavformat/http.c

See: 857841c1b63bf3ffacef03da2bd6275d55ead769
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/http.c