summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-25 23:09:40 +0100
committerwm4 <wm4@nowhere>2013-11-25 23:09:40 +0100
commit83dc3a81f18aed146063b8f410b6d0517cf57b87 (patch)
tree58da52c18ed90b0f6c85b765abe5d2eb5422dd75 /video
parent4205bbf243227bf151f2439ecb7772c41ecbfd12 (diff)
downloadmpv-83dc3a81f18aed146063b8f410b6d0517cf57b87.tar.bz2
mpv-83dc3a81f18aed146063b8f410b6d0517cf57b87.tar.xz
dec_video: fix function signature
Just why...? And why did this take 7 years?
Diffstat (limited to 'video')
-rw-r--r--video/decode/dec_video.c5
-rw-r--r--video/decode/dec_video.h5
2 files changed, 6 insertions, 4 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index e9a59da255..be2ac8aabe 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -205,8 +205,9 @@ bool video_init_best_codec(struct dec_video *d_video, char* video_decoders)
return !!d_video->vd_driver;
}
-void *video_decode(struct dec_video *d_video, struct demux_packet *packet,
- int drop_frame)
+struct mp_image *video_decode(struct dec_video *d_video,
+ struct demux_packet *packet,
+ int drop_frame)
{
mp_image_t *mpi = NULL;
struct MPOpts *opts = d_video->opts;
diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h
index 7d8928eb58..9802e4c300 100644
--- a/video/decode/dec_video.h
+++ b/video/decode/dec_video.h
@@ -69,8 +69,9 @@ bool video_init_best_codec(struct dec_video *d_video, char* video_decoders);
void video_uninit(struct dec_video *d_video);
struct demux_packet;
-void *video_decode(struct dec_video *d_video, struct demux_packet *packet,
- int drop_frame);
+struct mp_image *video_decode(struct dec_video *d_video,
+ struct demux_packet *packet,
+ int drop_frame);
int video_get_colors(struct dec_video *d_video, const char *item, int *value);
int video_set_colors(struct dec_video *d_video, const char *item, int value);