From 0b5ae1fdd31ace06b507350128c6d15384e8f3df Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Sun, 17 Apr 2011 19:48:27 +0200
Subject: asfdec: Remove dead code from asf_read_close().

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

(limited to 'libavformat')

diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 36e9efad75..8dc5291ff1 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -1132,12 +1132,8 @@ static void asf_reset_header(AVFormatContext *s)
 
 static int asf_read_close(AVFormatContext *s)
 {
-    int i;
-
     asf_reset_header(s);
-    for(i=0;i<s->nb_streams;i++) {
-        AVStream *st = s->streams[i];
-    }
+
     return 0;
 }
 
-- 
cgit v1.2.3


From f0a41afd8a37ebe972436fabfa3d289178bbd83b Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Sun, 17 Apr 2011 20:13:59 +0200
Subject: Replace mplayerhq.hu URLs by libav.org.

---
 libavcodec/nellymoserenc.c | 2 +-
 libavcodec/svq3.c          | 2 +-
 libavcodec/utils.c         | 2 +-
 libavformat/flic.c         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'libavformat')

diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c
index 586443dd15..676e30670a 100644
--- a/libavcodec/nellymoserenc.c
+++ b/libavcodec/nellymoserenc.c
@@ -28,7 +28,7 @@
  *
  * Generic codec information: libavcodec/nellymoserdec.c
  *
- * Some information also from: http://samples.mplayerhq.hu/A-codecs/Nelly_Moser/ASAO/ASAO.zip
+ * Some information also from: http://samples.libav.org/A-codecs/Nelly_Moser/ASAO/ASAO.zip
  *                             (Copyright Joseph Artsimovich and UAB "DKD")
  *
  * for more information about nellymoser format, visit:
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index 5886713b28..50c5d22fe4 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -37,7 +37,7 @@
  *
  * You will know you have these parameters passed correctly when the decoder
  * correctly decodes this file:
- *  http://samples.mplayerhq.hu/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov
+ *  http://samples.libav.org/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov
  */
 #include "internal.h"
 #include "dsputil.h"
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 857538868d..6d31254afb 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1204,7 +1204,7 @@ void av_log_ask_for_sample(void *avc, const char *msg)
     if (msg)
         av_log(avc, AV_LOG_WARNING, "%s ", msg);
     av_log(avc, AV_LOG_WARNING, "If you want to help, upload a sample "
-            "of this file to ftp://upload.libav.org/MPlayer/incoming/ "
+            "of this file to ftp://upload.libav.org/incoming/ "
             "and contact the libav-devel mailing list.\n");
 }
 
diff --git a/libavformat/flic.c b/libavformat/flic.c
index 4b59398222..fcdf4c8040 100644
--- a/libavformat/flic.c
+++ b/libavformat/flic.c
@@ -117,7 +117,7 @@ static int flic_read_header(AVFormatContext *s,
 
     if (!st->codec->width || !st->codec->height) {
         /* Ugly hack needed for the following sample: */
-        /* http://samples.mplayerhq.hu/fli-flc/fli-bugs/specular.flc */
+        /* http://samples.libav.org/fli-flc/fli-bugs/specular.flc */
         av_log(s, AV_LOG_WARNING,
                "File with no specified width/height. Trying 640x480.\n");
         st->codec->width  = 640;
-- 
cgit v1.2.3