Merge commit 'f859fed03d5d039430baea03a0ef35cfd6ac4abd' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Mar 2014 02:56:19 +0000 (03:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Mar 2014 02:56:19 +0000 (03:56 +0100)
* commit 'f859fed03d5d039430baea03a0ef35cfd6ac4abd':
  http: Always allow no-op seek

Conflicts:
libavformat/http.c

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

Simple merge