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. --- demux/demux_lavf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'demux/demux_lavf.c') diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 608bf0e03c..5689246114 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -592,9 +592,9 @@ static void handle_stream(demuxer_t *demuxer, int i) sh_sub = sh->sub; if (codec->extradata_size) { - sh_sub->extradata = talloc_size(sh, codec->extradata_size); - memcpy(sh_sub->extradata, codec->extradata, codec->extradata_size); - sh_sub->extradata_len = codec->extradata_size; + sh->extradata = talloc_size(sh, codec->extradata_size); + memcpy(sh->extradata, codec->extradata, codec->extradata_size); + sh->extradata_size = codec->extradata_size; } if (matches_avinputformat_name(priv, "microdvd")) { -- cgit v1.2.3