aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2015-05-10 03:31:44 -0300
committerJames Almer <jamrial@gmail.com>2015-05-14 20:57:24 -0300
commit9fc45b313c3785b6e710c9cdf89d7d1507a577ea (patch)
treea57f5be12feb698be7163e6218c6f809e5d83afb
parentd9390b9d649c8c5e6facf0be522afadb92132032 (diff)
downloadffmpeg-9fc45b313c3785b6e710c9cdf89d7d1507a577ea.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> (cherry picked from commit 32a4177a627ddce984a5a9ed7023d9a63dcbdf85)
-rw-r--r--libavformat/dashenc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index 92b7d6c773..0c75713412 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -494,7 +494,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];
@@ -509,7 +509,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];