diff options
author | wm4 <wm4@nowhere> | 2015-06-21 18:06:14 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-06-21 18:06:14 +0200 |
commit | be882175d85d8b1ea253dce11494a53264d04148 (patch) | |
tree | 9503dcaf5a1f0f858cdaca94f754b0908cba5a33 /demux/demux_libass.c | |
parent | c66be698cd8136933b80c4e0ef1698158c10316c (diff) | |
download | mpv-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 'demux/demux_libass.c')
-rw-r--r-- | demux/demux_libass.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demux/demux_libass.c b/demux/demux_libass.c index b83408b21b..ef09f042ed 100644 --- a/demux/demux_libass.c +++ b/demux/demux_libass.c @@ -95,8 +95,8 @@ static int d_check_file(struct demuxer *demuxer, enum demux_check check) struct sh_stream *sh = new_sh_stream(demuxer, STREAM_SUB); sh->codec = "ass"; - sh->sub->extradata = cbuf.start; - sh->sub->extradata_len = cbuf.len; + sh->extradata = cbuf.start; + sh->extradata_size = cbuf.len; demuxer->seekable = true; demuxer->fully_read = true; |