mirror of https://github.com/mpv-player/mpv
cleanup: remove unused MEncoder-related code
Remove some code and variables that were no longer used after MEncoder removal. Also remove some MEncoder references in comments.
This commit is contained in:
parent
23ba934ec8
commit
83f37b54de
|
@ -260,7 +260,6 @@ const m_option_t mplayer_opts[]={
|
|||
{"menu", "OSD menu support was not compiled in.\n", CONF_TYPE_PRINT,0, 0, 0, NULL},
|
||||
#endif /* CONFIG_MENU */
|
||||
|
||||
// these should be moved to -common, and supported in MEncoder
|
||||
{"vobsub", &vobsub_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
|
||||
{"vobsubid", &vobsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL},
|
||||
#ifdef CONFIG_UNRAR_EXEC
|
||||
|
@ -278,7 +277,6 @@ const m_option_t mplayer_opts[]={
|
|||
OPT_FLAG_ON("benchmark", benchmark, 0),
|
||||
|
||||
// dump some stream out instead of playing the file
|
||||
// this really should be in MEncoder instead of MPlayer... -> TODO
|
||||
OPT_STRING("dumpfile", stream_dump_name, 0),
|
||||
{"dumpaudio", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 1, NULL},
|
||||
{"dumpvideo", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 2, NULL},
|
||||
|
|
|
@ -67,9 +67,3 @@ void set_default_mplayer_options(struct MPOpts *opts)
|
|||
}
|
||||
};
|
||||
}
|
||||
|
||||
void set_default_mencoder_options(struct MPOpts *opts)
|
||||
{
|
||||
set_default_mplayer_options(opts);
|
||||
opts->user_correct_pts = 0;
|
||||
}
|
||||
|
|
|
@ -1,3 +1,2 @@
|
|||
struct MPOpts;
|
||||
void set_default_mplayer_options(struct MPOpts *opts);
|
||||
void set_default_mencoder_options(struct MPOpts *opts);
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* - XviD 1.x decoder module for mplayer/mencoder -
|
||||
* - XviD 1.x decoder module for mplayer -
|
||||
*
|
||||
* Copyright(C) 2003 Marco Belli <elcabesa@inwind.it>
|
||||
* 2003-2004 Edouard Gomez <ed.gomez@free.fr>
|
||||
|
|
|
@ -14,9 +14,8 @@
|
|||
* if you call the filter with the i (lowercase)
|
||||
* ... -vf framestep=i ...
|
||||
* then a I! followed by a cr is printed when a key frame (eg Intra frame) is
|
||||
* found, leaving the current line of mplayer/mencoder, where you got the
|
||||
* time, in seconds, and frame of the key. Use this information to split the
|
||||
* AVI.
|
||||
* found, leaving the current line of mplayer, where you got the time, in
|
||||
* seconds, and frame of the key. Use this information to split the AVI.
|
||||
*
|
||||
* After the i or alone you can put a positive number and only one frame every
|
||||
* x (the number you set) is passed on the filter chain, limiting the output
|
||||
|
|
|
@ -336,8 +336,6 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts)
|
|||
return continue_buffered_image(vf);
|
||||
}
|
||||
|
||||
extern const int under_mencoder;
|
||||
|
||||
static int continue_buffered_image(struct vf_instance *vf)
|
||||
{
|
||||
int i=vf->priv->buffered_i;
|
||||
|
@ -390,8 +388,7 @@ static int continue_buffered_image(struct vf_instance *vf)
|
|||
dmpi->stride[2] = 2*mpi->stride[2];
|
||||
}
|
||||
ret |= vf_next_put_image(vf, dmpi, pts);
|
||||
if (!under_mencoder)
|
||||
break;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
|
@ -418,8 +415,7 @@ static int continue_buffered_image(struct vf_instance *vf)
|
|||
mpi->chroma_width, mpi->chroma_height, (i^!tff));
|
||||
}
|
||||
ret |= vf_next_put_image(vf, dmpi, pts);
|
||||
if (!under_mencoder)
|
||||
break;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
|
@ -442,8 +438,7 @@ static int continue_buffered_image(struct vf_instance *vf)
|
|||
dmpi->stride[2], mpi->stride[2]*2, (i^!tff));
|
||||
}
|
||||
ret |= vf_next_put_image(vf, dmpi, pts);
|
||||
if (!under_mencoder)
|
||||
break;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -411,8 +411,6 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
|
|||
return continue_buffered_image(vf);
|
||||
}
|
||||
|
||||
extern const int under_mencoder;
|
||||
|
||||
static int continue_buffered_image(struct vf_instance *vf)
|
||||
{
|
||||
mp_image_t *mpi = vf->priv->buffered_mpi;
|
||||
|
@ -431,11 +429,10 @@ static int continue_buffered_image(struct vf_instance *vf)
|
|||
mpi->width,mpi->height);
|
||||
vf_clone_mpi_attributes(dmpi, mpi);
|
||||
filter(vf->priv, dmpi->planes, dmpi->stride, mpi->w, mpi->h, i ^ tff ^ 1, tff);
|
||||
if (i < (vf->priv->mode & 1) && !under_mencoder)
|
||||
if (i < (vf->priv->mode & 1))
|
||||
vf_queue_frame(vf, continue_buffered_image);
|
||||
ret |= vf_next_put_image(vf, dmpi, pts /*FIXME*/);
|
||||
if (!under_mencoder)
|
||||
break;
|
||||
break;
|
||||
}
|
||||
vf->priv->buffered_i = 1;
|
||||
return ret;
|
||||
|
|
|
@ -1229,7 +1229,7 @@ struct osd_state *osd_create(void)
|
|||
draw_alpha_init_flag=1;
|
||||
vo_draw_alpha_init();
|
||||
}
|
||||
// temp hack, should be moved to mplayer/mencoder later
|
||||
// temp hack, should be moved to mplayer later
|
||||
new_osd_obj(OSDTYPE_OSD);
|
||||
new_osd_obj(OSDTYPE_SUBTITLE);
|
||||
new_osd_obj(OSDTYPE_PROGBAR);
|
||||
|
|
2
mp_msg.h
2
mp_msg.h
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include <stdarg.h>
|
||||
|
||||
// defined in mplayer.c and mencoder.c
|
||||
// defined in mplayer.c
|
||||
extern int verbose;
|
||||
|
||||
/* No-op macro to mark translated strings in the sources */
|
||||
|
|
|
@ -50,7 +50,6 @@ ASS_Track *ass_track = 0; // current track to render
|
|||
sub_data* subdata = NULL;
|
||||
subtitle* vo_sub_last = NULL;
|
||||
|
||||
const char *mencoder_version = "MEncoder " VERSION;
|
||||
const char *mplayer_version = "MPlayer " VERSION;
|
||||
|
||||
void print_version(const char* name)
|
||||
|
|
|
@ -30,7 +30,6 @@ extern struct subtitle *vo_sub_last;
|
|||
extern int disable_system_conf;
|
||||
extern int disable_user_conf;
|
||||
|
||||
extern const char *mencoder_version;
|
||||
extern const char *mplayer_version;
|
||||
|
||||
struct MPContext;
|
||||
|
|
|
@ -98,7 +98,6 @@
|
|||
|
||||
#include "input/input.h"
|
||||
|
||||
const int under_mencoder = 0;
|
||||
int slave_mode=0;
|
||||
int enable_mouse_movements=0;
|
||||
float start_volume = -1;
|
||||
|
|
|
@ -888,7 +888,6 @@ static void demux_close_tv(demuxer_t *demuxer)
|
|||
demuxer->teletext=NULL;
|
||||
}
|
||||
|
||||
/* utilities for mplayer (not mencoder!!) */
|
||||
int tv_set_color_options(tvi_handle_t *tvh, int opt, int value)
|
||||
{
|
||||
const tvi_functions_t *funcs = tvh->functions;
|
||||
|
|
Loading…
Reference in New Issue