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. --- sub/dec_sub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sub') diff --git a/sub/dec_sub.c b/sub/dec_sub.c index bfb2c04a99..f03526ca8b 100644 --- a/sub/dec_sub.c +++ b/sub/dec_sub.c @@ -202,8 +202,8 @@ void sub_init_from_sh(struct dec_sub *sub, struct sh_stream *sh) pthread_mutex_lock(&sub->lock); - if (sh->sub->extradata && !sub->init_sd.extradata) - sub_set_extradata(sub, sh->sub->extradata, sh->sub->extradata_len); + if (sh->extradata && !sub->init_sd.extradata) + sub_set_extradata(sub, sh->extradata, sh->extradata_size); struct sd init_sd = sub->init_sd; init_sd.codec = sh->codec; -- cgit v1.2.3