From ab318aeea84f51fa0adcfb09a8a43abc67dae1cd Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 1 Feb 2016 21:32:01 +0100 Subject: audio/video: merge decoder return values Will be helpful for the coming filter support. I planned on merging audio/video decoding, but this will have to wait a bit longer, so only remove the duplicate status codes. --- video/decode/dec_video.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'video/decode/dec_video.h') diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h index 9e9f2d54c2..021c0be911 100644 --- a/video/decode/dec_video.h +++ b/video/decode/dec_video.h @@ -84,16 +84,11 @@ bool video_init_best_codec(struct dec_video *d_video, char* video_decoders); void video_uninit(struct dec_video *d_video); void video_work(struct dec_video *d_video); +int video_get_frame(struct dec_video *d_video, struct mp_image **out_mpi); void video_set_framedrop(struct dec_video *d_video, bool enabled); void video_set_start(struct dec_video *d_video, double start_pts); -#define VIDEO_OK 1 -#define VIDEO_WAIT 0 -#define VIDEO_EOF -1 -#define VIDEO_SKIP -2 -int video_get_frame(struct dec_video *d_video, struct mp_image **out_mpi); - 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); -- cgit v1.2.3