summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--demux/demux_lavf.c2
-rw-r--r--demux/stheader.h1
-rw-r--r--sub/dec_sub.c2
-rw-r--r--sub/sd.h3
4 files changed, 0 insertions, 8 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 4c960403da..0275b1afd2 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -560,8 +560,6 @@ static void handle_stream(demuxer_t *demuxer, int i)
memcpy(sh_sub->extradata, codec->extradata, codec->extradata_size);
sh_sub->extradata_len = codec->extradata_size;
}
- sh_sub->w = codec->width;
- sh_sub->h = codec->height;
if (matches_avinputformat_name(priv, "microdvd")) {
AVRational r;
diff --git a/demux/stheader.h b/demux/stheader.h
index d0f409742f..fbfba01367 100644
--- a/demux/stheader.h
+++ b/demux/stheader.h
@@ -93,7 +93,6 @@ typedef struct sh_video {
typedef struct sh_sub {
unsigned char *extradata; // extra header data passed from demuxer
int extradata_len;
- int w, h; // mp4 vobsubs
double frame_based; // timestamps are frame-based (and this is the
// fallback framerate used for timestamps)
bool is_utf8; // if false, subtitle packet charset is unknown
diff --git a/sub/dec_sub.c b/sub/dec_sub.c
index 7a0f5eb408..0a26e6f6a5 100644
--- a/sub/dec_sub.c
+++ b/sub/dec_sub.c
@@ -207,8 +207,6 @@ void sub_init_from_sh(struct dec_sub *sub, struct sh_stream *sh)
sub_set_extradata(sub, sh->sub->extradata, sh->sub->extradata_len);
struct sd init_sd = sub->init_sd;
init_sd.codec = sh->codec;
- init_sd.sub_stream_w = sh->sub->w;
- init_sd.sub_stream_h = sh->sub->h;
while (sub->num_sd < MAX_NUM_SD) {
struct sd *sd = talloc(NULL, struct sd);
diff --git a/sub/sd.h b/sub/sd.h
index 3f348fcb32..7b2399056a 100644
--- a/sub/sd.h
+++ b/sub/sd.h
@@ -25,9 +25,6 @@ struct sd {
// the resolution of the VO, nor does it have to be the OSD resolution.
int sub_video_w, sub_video_h;
- // Resolution hints stored in mp4 files.
- int sub_stream_w, sub_stream_h;
-
// Shared renderer for ASS - done to avoid reloading embedded fonts.
struct ass_library *ass_library;
struct ass_renderer *ass_renderer;