summaryrefslogtreecommitdiffstats
path: root/video/decode/dec_video.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-03-28 20:16:11 +0100
committerwm4 <wm4@nowhere>2013-03-28 21:46:17 +0100
commit3374a43998f183b585640de0a588db2431ed87ae (patch)
treecaa863740ad976d735c4b874e87f260c126f01f8 /video/decode/dec_video.c
parentac1c5e6e18afc5043fa078803ef465bb4017c07a (diff)
downloadmpv-3374a43998f183b585640de0a588db2431ed87ae.tar.bz2
mpv-3374a43998f183b585640de0a588db2431ed87ae.tar.xz
core: always pass data via packet fields to video decoders
Makes the code a bit simpler to follow, at least in the "modern" decoding path (update_video_nocorrect_pts() is used with old demuxers, which don't return proper packets and need further parsing, so this code looks less simple now).
Diffstat (limited to 'video/decode/dec_video.c')
-rw-r--r--video/decode/dec_video.c4
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. --------------------