diff options
| author | wm4 <wm4@nowhere> | 2016-01-14 00:18:31 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-01-14 00:18:31 +0100 |
| commit | bf13bd0d47e5fc6761c51c6ba7056968e60bf4cd (patch) | |
| tree | a031821a03564128a5e0dabb0a33361fd56b0e07 /video/decode/dec_video.h | |
| parent | dd973da108165ebb95e856dbc82326cb35fb45a5 (diff) | |
| download | mpv-bf13bd0d47e5fc6761c51c6ba7056968e60bf4cd.tar.bz2 mpv-bf13bd0d47e5fc6761c51c6ba7056968e60bf4cd.tar.xz | |
video: refactor: handle video format fixups closer to decoder
Instead of handling this on filter chain reinit, do it directly after
the decoder. This makes the code less entangled. In particular, this
gets rid of the really weird "override params" concept in the video
filter code.
The last_format/fixed_formats have some redundance with decoder_output,
but unfortunately the latter has a slightly different use.
Diffstat (limited to 'video/decode/dec_video.h')
| -rw-r--r-- | video/decode/dec_video.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h index ad33d784f6..fe325806c6 100644 --- a/video/decode/dec_video.h +++ b/video/decode/dec_video.h @@ -69,6 +69,8 @@ struct dec_video { double decoded_pts; float fps; // FPS from demuxer or from user override + + struct mp_image_params last_format, fixed_format; float initial_decoder_aspect; // State used only by player/video.c @@ -90,9 +92,6 @@ int video_set_colors(struct dec_video *d_video, const char *item, int value); void video_reset_decoding(struct dec_video *d_video); int video_vd_control(struct dec_video *d_video, int cmd, void *arg); -int video_reconfig_filters(struct dec_video *d_video, - const struct mp_image_params *params); - int video_vf_vo_control(struct dec_video *d_video, int vf_cmd, void *data); #endif /* MPLAYER_DEC_VIDEO_H */ |