aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2015-05-10 03:31:44 -0300
committerMichael Niedermayer <michaelni@gmx.at>2015-05-11 01:37:39 +0200
commit32a4177a627ddce984a5a9ed7023d9a63dcbdf85 (patch)
tree6520736a09ce88d1c4554ac608663ccbdc4619a9
parent8d916ef5f74d9e79f1a5c4fde3116ebda3d5ffbe (diff)
downloadffmpeg-32a4177a627ddce984a5a9ed7023d9a63dcbdf85.tar.gz
dashenc: replace attribute id with contentType for the AdaptationSet element
id should be an integer, not a string. It is also optional, so use contentType instead which is the proper attribute for these values. This addresses ticket #4545, fixing an MPD validation error. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/dashenc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index caa2a2153d..127f5b12ff 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -503,7 +503,7 @@ static int write_manifest(AVFormatContext *s, int final)
}
if (c->has_video) {
- avio_printf(out, "\t\t<AdaptationSet id=\"video\" segmentAlignment=\"true\" bitstreamSwitching=\"true\">\n");
+ avio_printf(out, "\t\t<AdaptationSet contentType=\"video\" segmentAlignment=\"true\" bitstreamSwitching=\"true\">\n");
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
OutputStream *os = &c->streams[i];
@@ -518,7 +518,7 @@ static int write_manifest(AVFormatContext *s, int final)
avio_printf(out, "\t\t</AdaptationSet>\n");
}
if (c->has_audio) {
- avio_printf(out, "\t\t<AdaptationSet id=\"audio\" segmentAlignment=\"true\" bitstreamSwitching=\"true\">\n");
+ avio_printf(out, "\t\t<AdaptationSet contentType=\"audio\" segmentAlignment=\"true\" bitstreamSwitching=\"true\">\n");
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
OutputStream *os = &c->streams[i];