Merge commit 'f0a41afd8a37ebe972436fabfa3d289178bbd83b'

* commit 'f0a41afd8a37ebe972436fabfa3d289178bbd83b':
Not pulled:  Replace mplayerhq.hu URLs by libav.org.
  asfdec: Remove dead code from asf_read_close().
  ptx: Use av_log_ask_for_sample() where appropriate.

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 1 insertions, 5 deletions

diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index cafcf857c5..8e228c6c34 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -1124,12 +1124,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;
 }