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)
* commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab':
  http: Always allow no-op seek

Conflicts:
libavformat/http.c

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

Simple merge