summaryrefslogtreecommitdiff
path: root/libavformat/rtpdec_asf.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2011-01-14 19:44:44 +0000
committerRonald S. Bultje <rsbultje@gmail.com>2011-01-14 19:44:44 +0000
commit06ed024d4faaf4ffb88baf84d5d12c4a9d0825a7 (patch)
tree509c15da84fcfc5ce3031e1f64c28a74d2af6c09 /libavformat/rtpdec_asf.c
parent8e8a3cc221ac61f2747b636f96c7ed042e6f18f1 (diff)
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
Diffstat (limited to 'libavformat/rtpdec_asf.c')
-rw-r--r--libavformat/rtpdec_asf.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c
index db872ce398..e31a825c2a 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;