diff options
| author | wm4 <wm4@nowhere> | 2013-02-09 15:15:28 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-02-10 17:25:57 +0100 |
| commit | a0987186b91680df473a7273a1eec130d0dd1a60 (patch) | |
| tree | 4f8d450f381333f5a52a1b9843bce8b1bb012ba8 /demux/demux_mkv.c | |
| parent | 4d016a92c876e98797c362d05468bf27d5a85414 (diff) | |
| download | mpv-a0987186b91680df473a7273a1eec130d0dd1a60.tar.bz2 mpv-a0987186b91680df473a7273a1eec130d0dd1a60.tar.xz | |
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.)
Diffstat (limited to 'demux/demux_mkv.c')
| -rw-r--r-- | demux/demux_mkv.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 { |