summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-06-21 18:06:14 +0200
committerwm4 <wm4@nowhere>2015-06-21 18:06:14 +0200
commitbe882175d85d8b1ea253dce11494a53264d04148 (patch)
tree9503dcaf5a1f0f858cdaca94f754b0908cba5a33 /sub
parentc66be698cd8136933b80c4e0ef1698158c10316c (diff)
downloadmpv-be882175d85d8b1ea253dce11494a53264d04148.tar.bz2
mpv-be882175d85d8b1ea253dce11494a53264d04148.tar.xz
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.
Diffstat (limited to 'sub')
-rw-r--r--sub/dec_sub.c4
1 files changed, 2 insertions, 2 deletions
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;