Mercurial > mplayer.hg

changeset 20176:31d504bf45f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics
author reimar
date Thu, 12 Oct 2006 17:21:15 +0000
parents 4b4acfeaa610
children 761dffbe4cf0
files libmpdemux/demux_mkv.c
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_mkv.c	Thu Oct 12 17:19:43 2006 +0000
+++ b/libmpdemux/demux_mkv.c	Thu Oct 12 17:21:15 2006 +0000
@@ -3936,9 +3936,8 @@
 {
   mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv;
   mkv_track_t *track = demux_mkv_find_track_by_num (mkv_d, track_num, MATROSKA_TRACK_SUBTITLE);
-          if ((track->language != NULL) &&
-              strcmp(track->language, "und"))
-            strlcpy(lang, track->language, maxlen);
+  if (track->language && strcmp(track->language, "und"))
+    strlcpy(lang, track->language, maxlen);
 }
 
 /** \brief Get the language code for an audio track.
@@ -3957,8 +3956,7 @@
 {
   mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv;
   mkv_track_t *track = demux_mkv_find_track_by_num (mkv_d, track_num, MATROSKA_TRACK_AUDIO);
-  if ((track->language != NULL) &&
-      strcmp(track->language, "und"))
+  if (track->language && strcmp(track->language, "und"))
     strlcpy(lang, track->language, maxlen);
 }