[SCM] libav/experimental: Copy metadata from ASF files contained in RTSP streams from ASF to RTSP layer, so that applications can read it also.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 06ed024d4faaf4ffb88baf84d5d12c4a9d0825a7
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date:   Fri Jan 14 19:44:44 2011 +0000

    Copy metadata from ASF files contained in RTSP streams from ASF to RTSP layer,
    so that applications can read it also.
    
    Originally committed as revision 26332 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c
index db872ce..e31a825 100644
--- a/libavformat/rtpdec_asf.c
+++ b/libavformat/rtpdec_asf.c
@@ -112,6 +112,7 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p)
         ret = av_open_input_stream(&rt->asf_ctx, &pb, "", &asf_demuxer, NULL);
         if (ret < 0)
             return ret;
+        av_metadata_copy(&s->metadata, rt->asf_ctx->metadata, 0);
         rt->asf_pb_pos = url_ftell(&pb);
         av_free(buf);
         rt->asf_ctx->pb = NULL;

-- 
Libav/FFmpeg packaging