From a0987186b91680df473a7273a1eec130d0dd1a60 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 9 Feb 2013 15:15:28 +0100 Subject: demux_lavf: remove code duplication Also move the lang field into the general stream header. (SH_COMMON is an old hack to "share" code between audio/video/sub headers.) There should be no functional changes, other than not printing stream info in verbose mode or with slave mode. (The frontend already prints stream info, and this is just a leftover when individual demuxers did this, and slave mode remains broken.) --- demux/demux_mkv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'demux/demux_mkv.c') diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 824d6df6ee..9604a8bafe 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -1337,7 +1337,7 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track, return 1; if (track->language && (strcmp(track->language, "und") != 0)) - sh_a->lang = talloc_strdup(sh_a, track->language); + sh_a->gsh->lang = talloc_strdup(sh_a, track->language); sh_a->gsh->demuxer_id = track->tnum; sh_a->gsh->title = talloc_strdup(sh_a, track->name); sh_a->gsh->default_track = track->default_track; @@ -1602,7 +1602,7 @@ static int demux_mkv_open_sub(demuxer_t *demuxer, mkv_track_t *track, memcpy(sh->extradata, track->private_data, track->private_size); sh->extradata_len = track->private_size; if (track->language && (strcmp(track->language, "und") != 0)) - sh->lang = talloc_strdup(sh, track->language); + sh->gsh->lang = talloc_strdup(sh, track->language); sh->gsh->title = talloc_strdup(sh, track->name); sh->gsh->default_track = track->default_track; } else { -- cgit v1.2.3