summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-01-21 22:33:28 +0100
committerwm4 <wm4@nowhere>2016-01-22 00:25:44 +0100
commit536efe6faf30964b77e0dd724e1c824e351008e7 (patch)
tree8c9a4a54ed8be5b43e3855d6cb365bc265089459 /video
parent7bb9203f7fec1ad4e40a7ae58d68b604c0a4565e (diff)
downloadmpv-536efe6faf30964b77e0dd724e1c824e351008e7.tar.bz2
mpv-536efe6faf30964b77e0dd724e1c824e351008e7.tar.xz
player: fix some oversights in video refactoring
vo_chain_uninit() isn't supposed to care much about the decoder (although decoders and outputs still go strictly together, so there is not much of an actual difference now). Also unset track.d_video correctly. Remove a stale declaration from dec_video.h as well.
Diffstat (limited to 'video')
-rw-r--r--video/decode/dec_video.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h
index 3aba448219..012f42c510 100644
--- a/video/decode/dec_video.h
+++ b/video/decode/dec_video.h
@@ -94,11 +94,6 @@ void video_set_start(struct dec_video *d_video, double start_pts);
#define VIDEO_SKIP -2
int video_get_frame(struct dec_video *d_video, struct mp_image **out_mpi);
-struct demux_packet;
-struct mp_image *video_decode(struct dec_video *d_video,
- struct demux_packet *packet,
- int drop_frame);
-
int video_vd_control(struct dec_video *d_video, int cmd, void *arg);
void video_reset(struct dec_video *d_video);
void video_reset_aspect(struct dec_video *d_video);