From 5dd5dc66c174a5c3c4a8789572445466fd04f2e7 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 18 Dec 2015 02:04:40 +0100 Subject: sub: remove unused video width/height headers Apparently, this was replaced by the SD_CTRL_SET_VIDEO_PARAMS set dimensions. But I can't find out when this happened - possibly, these fields were never used by sd_lavc.c, and only by the (long removed) MPlayer dvdsub decoder. --- sub/dec_sub.c | 8 -------- sub/dec_sub.h | 1 - sub/sd.h | 5 ----- 3 files changed, 14 deletions(-) (limited to 'sub') diff --git a/sub/dec_sub.c b/sub/dec_sub.c index 4450f577c2..4746b8f2cc 100644 --- a/sub/dec_sub.c +++ b/sub/dec_sub.c @@ -112,14 +112,6 @@ bool sub_is_initialized(struct dec_sub *sub) return r; } -void sub_set_video_res(struct dec_sub *sub, int w, int h) -{ - pthread_mutex_lock(&sub->lock); - sub->init_sd.sub_video_w = w; - sub->init_sd.sub_video_h = h; - pthread_mutex_unlock(&sub->lock); -} - void sub_set_video_fps(struct dec_sub *sub, double fps) { pthread_mutex_lock(&sub->lock); diff --git a/sub/dec_sub.h b/sub/dec_sub.h index 117396d9b2..40a882c9f0 100644 --- a/sub/dec_sub.h +++ b/sub/dec_sub.h @@ -29,7 +29,6 @@ void sub_destroy(struct dec_sub *sub); void sub_lock(struct dec_sub *sub); void sub_unlock(struct dec_sub *sub); -void sub_set_video_res(struct dec_sub *sub, int w, int h); void sub_set_video_fps(struct dec_sub *sub, double fps); void sub_set_ass_renderer(struct dec_sub *sub, struct ass_library *ass_library, struct ass_renderer *ass_renderer, diff --git a/sub/sd.h b/sub/sd.h index 2d9207dc48..c73f74e151 100644 --- a/sub/sd.h +++ b/sub/sd.h @@ -17,11 +17,6 @@ struct sd { void *priv; struct sh_stream *sh; - - // Video resolution used for subtitle decoding. Doesn't necessarily match - // the resolution of the VO, nor does it have to be the OSD resolution. - int sub_video_w, sub_video_h; - double video_fps; // Shared renderer for ASS - done to avoid reloading embedded fonts. -- cgit v1.2.3