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>
libavformat/http.c

index a06649f..51824e9 100644 (file)
@@ -1048,7 +1048,8 @@ static int64_t http_seek(URLContext *h, int64_t off, int whence)
 
     if (whence == AVSEEK_SIZE)
         return s->filesize;
-    else if ((whence == SEEK_CUR && off == 0) || (whence == SEEK_SET && off == s->off))
+    else if ((whence == SEEK_CUR && off == 0) ||
+             (whence == SEEK_SET && off == s->off))
         return s->off;
     else if ((s->filesize == -1 && whence == SEEK_END) || h->is_streamed)
         return AVERROR(ENOSYS);