diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-26 06:42:03 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-26 06:42:03 +0300 |
| commit | 0f73474fca60c3b06afab7906d0671ac3bef42b4 (patch) | |
| tree | 071fe8b782cd1a79acf21e22b2c8e4db0919a043 /mplayer.c | |
| parent | 0e85dc0f3272a3b8eec7cb4c8010c233c725ce73 (diff) | |
| download | mpv-0f73474fca60c3b06afab7906d0671ac3bef42b4.tar.bz2 mpv-0f73474fca60c3b06afab7906d0671ac3bef42b4.tar.xz | |
Fix compilation with dvdnav enabled
Some dvdnav-specific code had not been properly updated after moving
options to option struct and removing global mpctx.
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -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) { + struct MPOpts *opts = &ctx->opts; if (ctx->sh_video) { /// clear video pts ctx->d_video->pts = 0.0f; @@ -1863,7 +1864,8 @@ static void mp_dvdnav_reset_stream (MPContext *ctx) { } /// 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, 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) -static void mp_dvdnav_save_smpi(int in_size, +static void mp_dvdnav_save_smpi(struct MPContext *mpctx, int in_size, unsigned char *start, mp_image_t *decoded_frame) { @@ -2282,7 +2284,8 @@ static double update_video(struct MPContext *mpctx, int *blit_frame) update_osd_msg(mpctx); current_module = "decode_video"; #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 if (in_size > 0 && !decoded_frame) #endif @@ -2290,7 +2293,7 @@ static double update_video(struct MPContext *mpctx, int *blit_frame) sh_video->pts); #ifdef USE_DVDNAV /// 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 current_module = "filter_video"; *blit_frame = (decoded_frame && filter_video(sh_video, decoded_frame, |