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)
commite727cbf0be206e4fe48776735c44b9cdfa96b332
treeb9ad0a2de171d62d5c570ba4363e71ca224fa100
parentbcc25353cf259ee63df4c2147630259cd90c8cd5
parentf859fed03d5d039430baea03a0ef35cfd6ac4abd
Merge commit 'f859fed03d5d039430baea03a0ef35cfd6ac4abd' into release/2.2

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

Conflicts:
libavformat/http.c

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