[FFmpeg-cvslog] matroskaenc: Don't set language to empty string, use "und"

Jan Gerber git at videolan.org
Sun Jul 20 14:08:59 CEST 2014


ffmpeg | branch: master | Jan Gerber <j at v2v.cc> | Sun Jul 20 10:36:51 2014 +0200| [73b7a360d8a3f1a3ff99b2e0342bdf2e2acf8508] | committer: Michael Niedermayer

matroskaenc: Don't set language to empty string, use "und"

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73b7a360d8a3f1a3ff99b2e0342bdf2e2acf8508
---

 libavformat/matroskaenc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 92d091f..3488ffe 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -737,7 +737,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
         put_ebml_string(pb, MATROSKA_ID_TRACKNAME, tag->value);
     tag = av_dict_get(st->metadata, "language", NULL, 0);
     if (mkv->mode != MODE_WEBM || codec->codec_id != AV_CODEC_ID_WEBVTT) {
-        put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, tag ? tag->value:"und");
+        put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, tag && tag->value ? tag->value:"und");
     } else if (tag && tag->value) {
         put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, tag->value);
     }



More information about the ffmpeg-cvslog mailing list