diff options
| author | wm4 <wm4@nowhere> | 2013-06-25 00:43:04 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-06-25 00:43:04 +0200 |
| commit | 403a266d466850621397c07e0b96cc2c493b2936 (patch) | |
| tree | 0835a0908b3df8cca8374d173c34e0bf7df7d842 /core/mp_core.h | |
| parent | 536871d7e5848eb385b97202a33b9382b5e8ab0e (diff) | |
| parent | 54851d60614e912fc422658302d72811a31b80f8 (diff) | |
| download | mpv-403a266d466850621397c07e0b96cc2c493b2936.tar.bz2 mpv-403a266d466850621397c07e0b96cc2c493b2936.tar.xz | |
Merge branch 'sub_mess2'
...the return.
Diffstat (limited to 'core/mp_core.h')
| -rw-r--r-- | core/mp_core.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/mp_core.h b/core/mp_core.h index 98a92cbea4..0bd6ecda15 100644 --- a/core/mp_core.h +++ b/core/mp_core.h @@ -290,8 +290,7 @@ extern int forced_subs_only; void uninit_player(struct MPContext *mpctx, unsigned int mask); void reinit_audio_chain(struct MPContext *mpctx); double playing_audio_pts(struct MPContext *mpctx); -struct track *mp_add_subtitles(struct MPContext *mpctx, char *filename, - float fps, int noerr); +struct track *mp_add_subtitles(struct MPContext *mpctx, char *filename, int noerr); int reinit_video_chain(struct MPContext *mpctx); int reinit_video_filters(struct MPContext *mpctx); void pause_player(struct MPContext *mpctx); |