From be882175d85d8b1ea253dce11494a53264d04148 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
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.
---
 demux/demux_disc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'demux/demux_disc.c')

diff --git a/demux/demux_disc.c b/demux/demux_disc.c
index 6a9220189c..68ad3817fa 100644
--- a/demux/demux_disc.c
+++ b/demux/demux_disc.c
@@ -112,8 +112,8 @@ static void add_dvd_streams(demuxer_t *demuxer)
             }
             s = talloc_asprintf_append(s, "\n");
 
-            sh->sub->extradata = s;
-            sh->sub->extradata_len = strlen(s);
+            sh->extradata = s;
+            sh->extradata_size = strlen(s);
         }
     }
 }
-- 
cgit v1.2.3