RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-22 03:08:33 +00:00
Code Issues Releases Wiki Activity

Fix compilation with dvdnav enabled

Browse Source 
Some dvdnav-specific code had not been properly updated after moving
options to option struct and removing global mpctx.
This commit is contained in:
Uoti Urpala 2008-06-26 06:42:03 +03:00
parent 0e85dc0f32
commit 0f73474fca
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mplayer.c
View File

@ -1830,6 +1830,7 @@ static mp_image_t * mp_dvdnav_copy_mpi(mp_image_t *to_mpi,
} }
static void mp_dvdnav_reset_stream (MPContext *ctx) { static void mp_dvdnav_reset_stream (MPContext *ctx) {
struct MPOpts *opts = &ctx->opts;
if (ctx->sh_video) { if (ctx->sh_video) {
/// clear video pts /// clear video pts
ctx->d_video->pts = 0.0f; ctx->d_video->pts = 0.0f;
@ -1863,7 +1864,8 @@ static void mp_dvdnav_reset_stream (MPContext *ctx) {
} }
/// Restore last decoded DVDNAV (still frame) /// Restore last decoded DVDNAV (still frame)
static mp_image_t *mp_dvdnav_restore_smpi(int *in_size, static mp_image_t *mp_dvdnav_restore_smpi(struct MPContext *mpctx,
int *in_size,
unsigned char **start, unsigned char **start,
mp_image_t *decoded_frame) mp_image_t *decoded_frame)
{ {
@ -1907,7 +1909,7 @@ static mp_image_t *mp_dvdnav_restore_smpi(int *in_size,
} }
/// Save last decoded DVDNAV (still frame) /// Save last decoded DVDNAV (still frame)
static void mp_dvdnav_save_smpi(int in_size, static void mp_dvdnav_save_smpi(struct MPContext *mpctx, int in_size,
unsigned char *start, unsigned char *start,
mp_image_t *decoded_frame) mp_image_t *decoded_frame)
{ {
@ -2282,7 +2284,8 @@ static double update_video(struct MPContext *mpctx, int *blit_frame)
update_osd_msg(mpctx); update_osd_msg(mpctx);
current_module = "decode_video"; current_module = "decode_video";
#ifdef USE_DVDNAV #ifdef USE_DVDNAV
decoded_frame = mp_dvdnav_restore_smpi(&in_size,&start,decoded_frame); decoded_frame = mp_dvdnav_restore_smpi(mpctx, &in_size,&start,
decoded_frame);
/// still frame has been reached, no need to decode /// still frame has been reached, no need to decode
if (in_size > 0 && !decoded_frame) if (in_size > 0 && !decoded_frame)
#endif #endif
@ -2290,7 +2293,7 @@ static double update_video(struct MPContext *mpctx, int *blit_frame)
sh_video->pts); sh_video->pts);
#ifdef USE_DVDNAV #ifdef USE_DVDNAV
/// save back last still frame for future display /// save back last still frame for future display
mp_dvdnav_save_smpi(in_size,start,decoded_frame); mp_dvdnav_save_smpi(mpctx, in_size, start, decoded_frame);
#endif #endif
current_module = "filter_video"; current_module = "filter_video";
*blit_frame = (decoded_frame && filter_video(sh_video, decoded_frame, *blit_frame = (decoded_frame && filter_video(sh_video, decoded_frame,