diff options
| author | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
| commit | ea7b920184a865a3343001318fc4a32dcfc7b4f5 (patch) | |
| tree | fbefd8539b77ee7473ad73740cc8ffa97bc4ffbe /video/decode/dec_video.c | |
| parent | 3dcc83a70609d392c8ecd917dd5c16995424e9c4 (diff) | |
| parent | d98e61ea438db66323734ad1b6bea66411a3c97b (diff) | |
| download | mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.bz2 mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.xz | |
Merge branch 'master' into low_quality_intel_crap
Conflicts:
video/out/gl_video_shaders.glsl
video/out/vo_opengl.c
Diffstat (limited to 'video/decode/dec_video.c')
| -rw-r--r-- | video/decode/dec_video.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c index 9888881e26..465791a1ed 100644 --- a/video/decode/dec_video.c +++ b/video/decode/dec_video.c @@ -275,7 +275,6 @@ int init_best_video_codec(sh_video_t *sh_video, char* video_decoders) } void *decode_video(sh_video_t *sh_video, struct demux_packet *packet, - unsigned char *start, int in_size, int drop_frame, double pts) { mp_image_t *mpi = NULL; @@ -311,8 +310,7 @@ void *decode_video(sh_video_t *sh_video, struct demux_packet *packet, } } - mpi = sh_video->vd_driver->decode(sh_video, packet, start, in_size, - drop_frame, &pts); + mpi = sh_video->vd_driver->decode(sh_video, packet, drop_frame, &pts); //------------------------ frame decoded. -------------------- |