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_lavf.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_lavf.c')
| -rw-r--r-- | demux/demux_lavf.c | 6 |
1 files changed, 3 insertions, 3 deletions
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")) { |