diff options
| author | Janne Grunau <janne-ffmpeg@jannau.net> | 2011-01-20 15:03:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-21 20:36:00 +0100 |
| commit | 236bb68d76fb28133883b8c8ba8cd23016a8efde (patch) | |
| tree | bf9b5b4200377fdc4c135c034e57c29f14683a3f | |
| parent | d7b219ca96025e36b4d925009e501173b7bfea4e (diff) | |
| download | ffmpeg-236bb68d76fb28133883b8c8ba8cd23016a8efde.tar.gz | |
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>
(cherry picked from commit e5fe65512bfc824b9827ed29909a54122582ef2a)
| -rw-r--r-- | libavformat/mpegtsenc.c | 4 |
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; |