Revert "Hack to add libass compatibility for mencoder with embedded f…

…ont support"

This reverts commit 95bdd89.

DOCS/man/en/mplayer.1

@@ -7480,48 +7480,6 @@ to the filter chain, and will not work with this filter. If none is given,
 the default filename is "timecodesv2.txt".
 .RE
 .
-.TP
-.B fixpts[=options]
-Fixes the presentation timestamps (PTS) of the frames.
-By default, the PTS passed to the next filter is dropped, but the following
-options can change that:
-.RSs
-.IPs print
-Print the incoming PTS.
-.IPs fps=<fps>
-Specify a frame per second value.
-.IPs start=<pts>
-Specify an initial value for the PTS.
-.IPs autostart=<n>
-Uses the 
-.IR n th
-incoming PTS as the initial PTS.
-All previous pts are kept, so setting a huge value or \-1 keeps the PTS
-intact.
-.IPs autofps=<n>
-Uses the 
-.IR n th
-incoming PTS after the end of autostart to determine the framerate.
-.RE
-.sp 1
-.RS
-.I EXAMPLE:
-.RE
-.PD 0
-.RSs
-.IPs "\-vf fixpts=fps=24000/1001,ass,fixpts"
-Generates a new sequence of PTS, uses it for ASS subtitles, then drops it.
-Generating a new sequence is useful when the timestamps are reset during the
-program; this is frequent on DVDs.
-Dropping it may be necessary to avoid confusing encoders.
-.RE
-.PD 1
-.sp 1
-.RS
-.I NOTE:
-Using this filter together with any sort of seeking (including -ss and EDLs)
-may make demons fly out of your nose.
-.RE
 .
 .SH "GENERAL ENCODING OPTIONS (MENCODER ONLY)"
 .
@@ -7643,14 +7601,6 @@ Currently the only such filter is harddup.
 Do not write OpenDML index for AVI files >1GB.
 .
 .TP
-.B \-keep\-pts
-Send the original presentation timestamp (PTS) down the filter and encoder
-chain.
-This may cause incorrect output ("badly interleaved") if the original PTS
-are wrong or the framerate is changed, but can be necessary for certain
-filters (such as ASS).
-.
-.TP
 .B \-noskip
 Do not skip frames.
 .

Makefile

@@ -416,7 +416,6 @@ SRCS_COMMON = asxparser.c \
               libmpcodecs/vf_field.c \
               libmpcodecs/vf_fil.c \
               libmpcodecs/vf_filmdint.c \
-              libmpcodecs/vf_fixpts.c \
               libmpcodecs/vf_flip.c \
               libmpcodecs/vf_format.c \
               libmpcodecs/vf_framestep.c \

cfg-mencoder.h

@@ -214,9 +214,6 @@ const m_option_t mencoder_opts[]={
 	{"odml", &write_odml, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
 	{"noodml", &write_odml, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
 
-	{"keep-pts", &keep_pts, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-	{"nokeep-pts", &keep_pts, CONF_TYPE_FLAG, 0, 1, 0, NULL},
-
 	// info header strings
 	{"info", (void *) info_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 

libmpcodecs/vf.c

@@ -101,7 +101,6 @@ extern const vf_info_t vf_info_blackframe;
 extern const vf_info_t vf_info_geq;
 extern const vf_info_t vf_info_ow;
 extern const vf_info_t vf_info_tcdump;
-extern const vf_info_t vf_info_fixpts;
 
 // list of available filters:
 static const vf_info_t* const filter_list[]={
@@ -204,7 +203,6 @@ static const vf_info_t* const filter_list[]={
     &vf_info_blackframe,
     &vf_info_ow,
     &vf_info_tcdump,
-    &vf_info_fixpts,
     NULL
 };