Merge time and marq filters. Marq now handles the %letter time format strings...

Merge time and marq filters. Marq now handles the %letter time format strings and new $letter VLC format strings. Still needs some work.

configure.ac

@@ -1166,7 +1166,7 @@ VLC_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio])
 if test "${SYS}" != "mingwce"; then
 dnl  VLC_ADD_PLUGINS([externrun])
   VLC_ADD_PLUGINS([access_fake access_filter_timeshift access_filter_record])
-  VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf time marq podcast shout sap fake folder])
+  VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf marq podcast shout sap fake folder])
   VLC_ADD_PLUGINS([rss mosaic wall motiondetect clone crop])
   VLC_ADD_PLUGINS([i420_yuy2 i422_yuy2 i420_ymga])
   VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler])

modules/video_filter/Modules.am

@@ -10,7 +10,6 @@ SOURCES_logo = logo.c
 SOURCES_deinterlace = deinterlace.c
 SOURCES_blend = blend.c
 SOURCES_scale = scale.c
-SOURCES_time = time.c
 SOURCES_marq = marq.c
 SOURCES_rss = rss.c
 SOURCES_motiondetect = motiondetect.c