Ticket #2710: follow-http-redirect.patch

libavformat/http.c

@@ -202 +202 @@
         location_changed = 0;
         goto redo;
     }
+    av_strlcpy(h->fileloc, s->location, sizeof(h->fileloc));
     return 0;
  fail:
     if (s->hd)

libavformat/aviobuf.c

@@ -788 +788 @@
         ffurl_close(h);
         return err;
     }
+
+    av_log(*s, AV_LOG_DEBUG, "Ressource opened: %s\n",  h->fileloc);
+    memcpy((*s)->res_opened, h->fileloc, sizeof((*s)->res_opened));
     return 0;
 }
 

libavformat/utils.c

@@ -505 +505 @@
         return ret;
     if (s->iformat)
         return 0;
-    return av_probe_input_buffer(s->pb, &s->iformat, filename, s, 0, s->probesize);
+
+    return av_probe_input_buffer(s->pb, &s->iformat, s->pb->res_opened, s, 0, s->probesize);
 }
 
 static AVPacket *add_to_pktbuf(AVPacketList **packet_buffer, AVPacket *pkt,
@@ -572 +573 @@
     }
 
     s->duration = s->start_time = AV_NOPTS_VALUE;
-    av_strlcpy(s->filename, filename ? filename : "", sizeof(s->filename));
+    av_strlcpy(s->filename, s->pb->res_opened ? s->pb->res_opened : "", sizeof(s->filename));
 
     /* allocate private data */
     if (s->iformat->priv_data_size > 0) {

libavformat/avio.h

@@ -79 +79 @@
      * to any av_opt_* functions in that case.
      */
     const AVClass *av_class;
+    char res_opened[4096];  /**< Ressource opened during probing */
     unsigned char *buffer;  /**< Start of the buffer. */
     int buffer_size;        /**< Maximum buffer size */
     unsigned char *buf_ptr; /**< Current position in the buffer */
@@ -140 +141 @@
      * This field is internal to libavformat and access from outside is not allowed.
      */
      int seek_count;
+
 } AVIOContext;
 
 /* unbuffered I/O */

libavformat/url.h

@@ -43 +43 @@
     struct URLProtocol *prot;
     void *priv_data;
     char *filename;             /**< specified URL */
+    char fileloc[4096];         /**< file location of a specified URL */
     int flags;
     int max_packet_size;        /**< if non zero, the stream is packetized with this max packet size */
     int is_streamed;            /**< true if streamed (no seek possible), default = false */