summaryrefslogtreecommitdiff
path: root/libavformat/mpegtsenc.c
diff options
context:
space:
mode:
authorJanne Grunau <janne-ffmpeg@jannau.net>2011-01-20 15:03:47 +0100
committerJanne Grunau <janne-ffmpeg@jannau.net>2011-01-20 15:28:32 +0100
commite5fe65512bfc824b9827ed29909a54122582ef2a (patch)
tree2850ec59fc814522ebccb42c4610c1603e95c77e /libavformat/mpegtsenc.c
parente8315e78814f92d6d031bd3a909d896351a416f8 (diff)
mpegtsenc: prefer metadata keyed with "service_name"
title metadata is only used as fallback if no service_name is available. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
Diffstat (limited to 'libavformat/mpegtsenc.c')
-rw-r--r--libavformat/mpegtsenc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 14bbd62ab4..f33b6c6b73 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -400,9 +400,9 @@ static int mpegts_write_header(AVFormatContext *s)
ts->tsid = DEFAULT_TSID;
ts->onid = DEFAULT_ONID;
/* allocate a single DVB service */
- title = av_metadata_get(s->metadata, "title", NULL, 0);
+ title = av_metadata_get(s->metadata, "service_name", NULL, 0);
if (!title)
- title = av_metadata_get(s->metadata, "service_name", NULL, 0);
+ title = av_metadata_get(s->metadata, "title", NULL, 0);
service_name = title ? title->value : DEFAULT_SERVICE_NAME;
provider = av_metadata_get(s->metadata, "service_provider", NULL, 0);
provider_name = provider ? provider->value : DEFAULT_PROVIDER_NAME;