diff options
| -rw-r--r-- | player/sub.c | 3 | ||||
| -rw-r--r-- | sub/dec_sub.c | 8 | ||||
| -rw-r--r-- | sub/dec_sub.h | 1 | ||||
| -rw-r--r-- | sub/sd.h | 5 |
4 files changed, 0 insertions, 17 deletions
diff --git a/player/sub.c b/player/sub.c index c2a3e80cb3..9ec7ba5e7b 100644 --- a/player/sub.c +++ b/player/sub.c @@ -258,13 +258,10 @@ static void reinit_subdec(struct MPContext *mpctx, struct track *track, struct sh_video *sh_video = mpctx->d_video ? mpctx->d_video->header->video : NULL; - int w = sh_video ? sh_video->disp_w : 0; - int h = sh_video ? sh_video->disp_h : 0; float fps = sh_video ? sh_video->fps : 25; init_sub_renderer(mpctx); - sub_set_video_res(dec_sub, w, h); sub_set_video_fps(dec_sub, fps); sub_set_ass_renderer(dec_sub, mpctx->ass_library, mpctx->ass_renderer, &mpctx->ass_lock); 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, @@ -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. |