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 /audio | |
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 'audio')
-rw-r--r-- | audio/decode/ad_lavc.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c index 71824fbfc6..ce628877be 100644 --- a/audio/decode/ad_lavc.c +++ b/audio/decode/ad_lavc.c @@ -126,11 +126,7 @@ static int init(struct dec_audio *da, const char *decoder) lavc_context->channel_layout = mp_chmap_to_lavc(&sh_audio->channels); // demux_mkv - if (sh_audio->codecdata_len && sh_audio->codecdata && - !lavc_context->extradata) { - mp_lavc_set_extradata(lavc_context, sh_audio->codecdata, - sh_audio->codecdata_len); - } + mp_lavc_set_extradata(lavc_context, sh->extradata, sh->extradata_size); if (sh->lav_headers) mp_copy_lav_codec_headers(lavc_context, sh->lav_headers); |