From be882175d85d8b1ea253dce11494a53264d04148 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 21 Jun 2015 18:06:14 +0200 Subject: demux: merge extradata fields MPlayer traditionally had completely separate sh_ structs for audio/video/subs, without a good way to share fields. This meant that fields shared across all these headers had to be duplicated. This commit deduplicates essentially the last remaining duplicated fields. --- audio/decode/ad_lavc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'audio') diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c index 71824fbfc6..ce628877be 100644 --- a/audio/decode/ad_lavc.c +++ b/audio/decode/ad_lavc.c @@ -126,11 +126,7 @@ static int init(struct dec_audio *da, const char *decoder) lavc_context->channel_layout = mp_chmap_to_lavc(&sh_audio->channels); // demux_mkv - if (sh_audio->codecdata_len && sh_audio->codecdata && - !lavc_context->extradata) { - mp_lavc_set_extradata(lavc_context, sh_audio->codecdata, - sh_audio->codecdata_len); - } + mp_lavc_set_extradata(lavc_context, sh->extradata, sh->extradata_size); if (sh->lav_headers) mp_copy_lav_codec_headers(lavc_context, sh->lav_headers); -- cgit v1.2.3