[FFmpeg-cvslog] avformat/http: simplify chained_options copying

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 15 14:24:09 2014 +0100| [deccb4d827d6bfa11eac1c3c62e2afebb8e01667] | committer: Michael Niedermayer

avformat/http: simplify chained_options copying

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=deccb4d827d6bfa11eac1c3c62e2afebb8e01667
---

 libavformat/http.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavformat/http.c b/libavformat/http.c
index f17b2f8..d9de05c 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -207,8 +207,7 @@ static int http_open_cnx(URLContext *h, AVDictionary **options)
     HTTPContext *s = h->priv_data;
     int location_changed, attempts = 0, redirects = 0;
 redo:
-    if (attempts > 0)
-        av_dict_copy(options, s->chained_options, 0);
+    av_dict_copy(options, s->chained_options, 0);
 
     cur_auth_type       = s->auth_state.auth_type;
     cur_proxy_auth_type = s->auth_state.auth_type;
@@ -271,7 +270,6 @@ int ff_http_do_new_request(URLContext *h, const char *uri)
     if (!s->location)
         return AVERROR(ENOMEM);
 
-    av_dict_copy(&options, s->chained_options, 0);
     ret = http_open_cnx(h, &options);
     av_dict_free(&options);
     return ret;
@@ -1139,7 +1137,6 @@ static int64_t http_seek(URLContext *h, int64_t off, int whence)
     s->hd = NULL;
 
     /* if it fails, continue on old connection */
-    av_dict_copy(&options, s->chained_options, 0);
     if ((ret = http_open_cnx(h, &options)) < 0) {
         av_dict_free(&options);
         memcpy(s->buffer, old_buf, old_buf_size);