summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-05-18 11:32:53 +0200
committerwm4 <wm4@nowhere>2013-05-18 17:32:37 +0200
commitc970f5c3288a0e0cb925327182d4317768be0b83 (patch)
tree4d00d9d39855d41f751bc30ee5913d20564ea64f /video
parentf921a675aed0d50bf94fb211692209c8ba618750 (diff)
downloadmpv-c970f5c3288a0e0cb925327182d4317768be0b83.tar.bz2
mpv-c970f5c3288a0e0cb925327182d4317768be0b83.tar.xz
video: rename VDCTRL_RESET_ASPECT to VDCTRL_REINIT_VO
Same thing, and VDCTRL_REINIT_VO implies more generic use.
Diffstat (limited to 'video')
-rw-r--r--video/decode/dec_video.c4
-rw-r--r--video/decode/dec_video.h2
-rw-r--r--video/decode/vd.h2
-rw-r--r--video/decode/vd_lavc.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index 465791a1ed..1dd83db8bd 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -162,9 +162,9 @@ void resync_video_stream(sh_video_t *sh_video)
sh_video->prev_sorted_pts = MP_NOPTS_VALUE;
}
-void video_reset_aspect(struct sh_video *sh_video)
+void video_reinit_vo(struct sh_video *sh_video)
{
- sh_video->vd_driver->control(sh_video, VDCTRL_RESET_ASPECT, NULL);
+ sh_video->vd_driver->control(sh_video, VDCTRL_REINIT_VO, NULL);
}
int get_current_video_decoder_lag(sh_video_t *sh_video)
diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h
index 94bd2bce3a..05e3c7f0a1 100644
--- a/video/decode/dec_video.h
+++ b/video/decode/dec_video.h
@@ -41,7 +41,7 @@ struct mp_csp_details;
void get_detected_video_colorspace(struct sh_video *sh, struct mp_csp_details *csp);
void set_video_colorspace(struct sh_video *sh);
void resync_video_stream(sh_video_t *sh_video);
-void video_reset_aspect(struct sh_video *sh_video);
+void video_reinit_vo(struct sh_video *sh_video);
int get_current_video_decoder_lag(sh_video_t *sh_video);
extern int divx_quality;
diff --git a/video/decode/vd.h b/video/decode/vd.h
index 88ce4b2f59..0e06f7bb40 100644
--- a/video/decode/vd.h
+++ b/video/decode/vd.h
@@ -42,7 +42,7 @@ extern const vd_functions_t *const mpcodecs_vd_drivers[];
#define VDCTRL_RESYNC_STREAM 8 // reset decode state after seeking
#define VDCTRL_QUERY_UNSEEN_FRAMES 9 // current decoder lag
-#define VDCTRL_RESET_ASPECT 10 // reinit filter/VO chain for new aspect ratio
+#define VDCTRL_REINIT_VO 10 // reinit filter/VO chain
int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int outfmt);
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index d723318c4e..0881d72705 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -772,7 +772,7 @@ static int control(sh_video_t *sh, int cmd, void *arg)
delay += avctx->thread_count - 1;
*(int *)arg = delay;
return CONTROL_TRUE;
- case VDCTRL_RESET_ASPECT:
+ case VDCTRL_REINIT_VO:
if (ctx->vo_initialized)
ctx->vo_initialized = false;
init_vo(sh, ctx->pic);