summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-12 17:21:15 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-12 17:21:15 +0000
commitaa5a9bc123eb6f78bad5a8b1610382a3cd79195a (patch)
tree6109e2a8f3ac2bf482168d86d1fd5476edbc273a /libmpdemux/demux_mkv.c
parent280c74691947938de87a5052f498573972d9445a (diff)
downloadmpv-aa5a9bc123eb6f78bad5a8b1610382a3cd79195a.tar.bz2
mpv-aa5a9bc123eb6f78bad5a8b1610382a3cd79195a.tar.xz
Cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20182 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 595a750e81..b3eb72b956 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -3936,9 +3936,8 @@ demux_mkv_get_sub_lang(demuxer_t *demuxer, int track_num, char *lang,
{
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 @@ demux_mkv_get_audio_lang(demuxer_t *demuxer, int track_num, char *lang,
{
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);
}