diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 02:33:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 02:34:12 +0200 |
| commit | c7168d1a22a67d908a556c2e1a4131932006fa22 (patch) | |
| tree | cce47f74ab3a974fca0de72936cccedd4b4bc9d3 /libavformat/mpegts.c | |
| parent | 70f7006eb311f49f627f6d3f4f8c43260cc33aa0 (diff) | |
| parent | fc27e7272e6f1a7053812f8a15b1b7098de44c71 (diff) | |
| download | ffmpeg-c7168d1a22a67d908a556c2e1a4131932006fa22.tar.gz | |
Merge commit 'fc27e7272e6f1a7053812f8a15b1b7098de44c71'
* commit 'fc27e7272e6f1a7053812f8a15b1b7098de44c71':
mpegts: do not export empty language tags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 71140888a5..04bc865c2a 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1674,7 +1674,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type break; } } - if (i) { + if (i && language[0]) { language[i - 1] = 0; av_dict_set(&st->metadata, "language", language, 0); } |