diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index ad544163e0..9112ea2433 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -1507,6 +1507,9 @@ This option is obsolete now that MPlayer has OpenDML support.
 .TP
 .B \-mc <seconds/frame>
 maximum A-V sync correction per frame (in seconds)
+.br
+\-mc 0 should always be combined with \-noskip for mencoder, otherwise
+it will almost certainly cause A-V desync.
 .
 .TP
 .B \-mf <option1:option2:...>
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 3f04ac3c3e..e61d41e440 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -9,6 +9,17 @@ release 20090308
 ;                   VIDEO CODECS
 ;=============================================================================
 
+videocodec ffbinkvideo
+  info "FFmpeg Bink Video"
+  status working
+  fourcc BIKf ; internal MPlayer FourCC
+  fourcc BIKg ; internal MPlayer FourCC
+  fourcc BIKh ; internal MPlayer FourCC
+  fourcc BIKi ; internal MPlayer FourCC
+  driver ffmpeg
+  dll binkvideo
+  out YV12
+
 videocodec ffcdgraphics
   info "FFmpeg CD-Graphics"
   status working
@@ -3755,6 +3766,20 @@ audiocodec ffsmkaud
   driver ffmpeg
   dll "smackaud"
 
+audiocodec ffbinkdctaud
+  info "FFmpeg Bink Audio (DCT)"
+  status buggy
+  fourcc BAU1 ; internal MPlayer FourCC
+  driver ffmpeg
+  dll "binkaudio_dct"
+
+audiocodec ffbinkrdftaud
+  info "FFmpeg Bink Audio (RDFT)"
+  status working
+  fourcc BAU2 ; internal MPlayer FourCC
+  driver ffmpeg
+  dll "binkaudio_rdft"
+
 audiocodec ffdsicinaudio
   info "FFmpeg Delphine CIN audio"
   status working
diff --git a/libmpcodecs/vd_dmo.c b/libmpcodecs/vd_dmo.c
index 42630d7c7e..125357fc8e 100644
--- a/libmpcodecs/vd_dmo.c
+++ b/libmpcodecs/vd_dmo.c
@@ -16,12 +16,15 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
+
+#if HAVE_MALLOC_H
+#include <malloc.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 
-#include "config.h"
-
 #include "mp_msg.h"
 #include "help_mp.h"
 
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index 873b950910..fa72ad25aa 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -475,7 +475,7 @@ struct vf_instance *vf_open_plugin_noerr(struct MPOpts *opts,
 	args = (char**)args[1];
       else
 	args = NULL;
-    *retcode = vf->info->open(vf,(char*)args);
+    *retcode = vf->info->vf_open(vf,(char*)args);
     if (*retcode > 0)
         return vf;
     free(vf);
diff --git a/libmpcodecs/vf.h b/libmpcodecs/vf.h
index 3d468d382a..e7293672a2 100644
--- a/libmpcodecs/vf.h
+++ b/libmpcodecs/vf.h
@@ -30,7 +30,7 @@ typedef struct vf_info_s {
     const char *name;
     const char *author;
     const char *comment;
-    int (*open)(struct vf_instance* vf,char* args);
+    int (*vf_open)(struct vf_instance* vf,char* args);
     // Ptr to a struct dscribing the options
     const void* opts;
 } vf_info_t;
diff --git a/libmpcodecs/vf_1bpp.c b/libmpcodecs/vf_1bpp.c
index a9321f8924..ee8ecfbadc 100644
--- a/libmpcodecs/vf_1bpp.c
+++ b/libmpcodecs/vf_1bpp.c
@@ -180,7 +180,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt){
     return vf->next->query_format(vf->next,best);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;
@@ -194,7 +194,7 @@ const vf_info_t vf_info_1bpp = {
     "1bpp",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_2xsai.c b/libmpcodecs/vf_2xsai.c
index 26bbd58eb5..fad52077e6 100644
--- a/libmpcodecs/vf_2xsai.c
+++ b/libmpcodecs/vf_2xsai.c
@@ -316,7 +316,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt){
     return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;
@@ -328,7 +328,7 @@ const vf_info_t vf_info_2xsai = {
     "2xsai",
     "A'rpi",
     "http://elektron.its.tudelft.nl/~dalikifa/",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c
index 9076ed099e..427129484d 100644
--- a/libmpcodecs/vf_ass.c
+++ b/libmpcodecs/vf_ass.c
@@ -382,7 +382,7 @@ static const unsigned int fmt_list[]={
 	0
 };
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	int flags;
 	vf->priv->outfmt = vf_match_csp(&vf->next,fmt_list,IMGFMT_YV12);
@@ -427,6 +427,6 @@ const vf_info_t vf_info_ass = {
 	"ass",
 	"Evgeniy Stepanov",
 	"",
-	open,
+	vf_open,
 	&vf_opts
 };
diff --git a/libmpcodecs/vf_blackframe.c b/libmpcodecs/vf_blackframe.c
index 34d2f1f506..40a327e787 100644
--- a/libmpcodecs/vf_blackframe.c
+++ b/libmpcodecs/vf_blackframe.c
@@ -118,7 +118,7 @@ static void uninit(struct vf_instance *vf) {
     if (vf->priv) free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->priv = malloc(sizeof(struct vf_priv_s));
     if (!vf->priv) return 0;
 
@@ -143,6 +143,6 @@ const vf_info_t vf_info_blackframe = {
     "blackframe",
     "Brian J. Murrell, Julian Hall, Ivo van Poorten",
     "Useful for detecting scene transitions",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_bmovl.c b/libmpcodecs/vf_bmovl.c
index 0277751527..073470e11e 100644
--- a/libmpcodecs/vf_bmovl.c
+++ b/libmpcodecs/vf_bmovl.c
@@ -458,7 +458,7 @@ put_image(struct vf_instance* vf, mp_image_t* mpi, double pts){
 } // put_image
 
 static int
-vf_open(vf_instance_t* vf, char* args)
+vf_open(vf_instance_t *vf, char *args)
 {
     char filename[1000];
 
diff --git a/libmpcodecs/vf_boxblur.c b/libmpcodecs/vf_boxblur.c
index e75f261375..0693b59e06 100644
--- a/libmpcodecs/vf_boxblur.c
+++ b/libmpcodecs/vf_boxblur.c
@@ -171,7 +171,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt){
 	return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 	int e;
 
 	vf->config=config;
@@ -207,7 +207,7 @@ const vf_info_t vf_info_boxblur = {
     "boxblur",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_crop.c b/libmpcodecs/vf_crop.c
index 96a90f606b..44dab194d4 100644
--- a/libmpcodecs/vf_crop.c
+++ b/libmpcodecs/vf_crop.c
@@ -155,7 +155,7 @@ static void draw_slice(struct vf_instance* vf,
 
 //===========================================================================//
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->start_slice=start_slice;
@@ -190,7 +190,7 @@ const vf_info_t vf_info_crop = {
     "crop",
     "A'rpi",
     "",
-    open,
+    vf_open,
     &vf_opts
 };
 
diff --git a/libmpcodecs/vf_cropdetect.c b/libmpcodecs/vf_cropdetect.c
index f777107a77..6af2c83692 100644
--- a/libmpcodecs/vf_cropdetect.c
+++ b/libmpcodecs/vf_cropdetect.c
@@ -174,7 +174,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt) {
 }
 //===========================================================================//
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;
@@ -194,7 +194,7 @@ const vf_info_t vf_info_cropdetect = {
     "cropdetect",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_decimate.c b/libmpcodecs/vf_decimate.c
index 2d8dcb7931..01c061518a 100644
--- a/libmpcodecs/vf_decimate.c
+++ b/libmpcodecs/vf_decimate.c
@@ -169,7 +169,7 @@ static void uninit(struct vf_instance* vf)
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	struct vf_priv_s *p;
 	vf->put_image = put_image;
@@ -193,6 +193,6 @@ const vf_info_t vf_info_decimate = {
     "decimate",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_delogo.c b/libmpcodecs/vf_delogo.c
index 2dd971fab9..9e59b553a2 100644
--- a/libmpcodecs/vf_delogo.c
+++ b/libmpcodecs/vf_delogo.c
@@ -196,7 +196,7 @@ static const unsigned int fmt_list[]={
     0
 };
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->get_image=get_image;
@@ -255,7 +255,7 @@ const vf_info_t vf_info_delogo = {
     "delogo",
     "Jindrich Makovicka, Alex Beregszaszi",
     "",
-    open,
+    vf_open,
     &vf_opts
 };
 
diff --git a/libmpcodecs/vf_denoise3d.c b/libmpcodecs/vf_denoise3d.c
index fc9924cbe9..7e7e6ef288 100644
--- a/libmpcodecs/vf_denoise3d.c
+++ b/libmpcodecs/vf_denoise3d.c
@@ -182,7 +182,7 @@ static void PrecalcCoefs(int *Ct, double Dist25)
 }
 
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
         double LumSpac, LumTmp, ChromSpac, ChromTmp;
         double Param1, Param2, Param3;
 
@@ -261,7 +261,7 @@ const vf_info_t vf_info_denoise3d = {
     "denoise3d",
     "Daniel Moreno",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_detc.c b/libmpcodecs/vf_detc.c
index 73a70c40be..2ae1b0436d 100644
--- a/libmpcodecs/vf_detc.c
+++ b/libmpcodecs/vf_detc.c
@@ -420,7 +420,7 @@ static void parse_args(struct vf_priv_s *p, char *args)
 	free(orig);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	struct vf_priv_s *p;
 	vf->config = config;
@@ -448,6 +448,6 @@ const vf_info_t vf_info_detc = {
     "detc",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_dint.c b/libmpcodecs/vf_dint.c
index 7314346493..75cd42690d 100644
--- a/libmpcodecs/vf_dint.c
+++ b/libmpcodecs/vf_dint.c
@@ -191,7 +191,7 @@ static int put_image (struct vf_instance* vf, mp_image_t *mpi, double pts)
     return vf_next_put_image (vf, mpi, pts);
 }
 
-static int open (vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config = config;
     vf->put_image = put_image;
 //    vf->default_reqs=VFCAP_ACCEPT_STRIDE;
@@ -209,6 +209,6 @@ const vf_info_t vf_info_dint = {
     "dint",
     "A.G.",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_divtc.c b/libmpcodecs/vf_divtc.c
index 0fe9576251..aaf091534b 100644
--- a/libmpcodecs/vf_divtc.c
+++ b/libmpcodecs/vf_divtc.c
@@ -595,7 +595,7 @@ static void uninit(struct vf_instance* vf)
       }
    }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
    {
    struct vf_priv_s *p;
    char *filename="framediff.log", *ap, *q, *a;
@@ -715,6 +715,6 @@ const vf_info_t vf_info_divtc =
    "divtc",
    "Ville Saari",
    "",
-   open,
+   vf_open,
    NULL
    };
diff --git a/libmpcodecs/vf_down3dright.c b/libmpcodecs/vf_down3dright.c
index 2cfceda7f3..3246ccb9f8 100644
--- a/libmpcodecs/vf_down3dright.c
+++ b/libmpcodecs/vf_down3dright.c
@@ -140,7 +140,7 @@ static void uninit(struct vf_instance* vf)
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	vf->config=config;
 	vf->query_format=query_format;
@@ -161,6 +161,6 @@ const vf_info_t vf_info_down3dright = {
 	"down3dright",
 	"Zdenek Kabelac",
 	"",
-	open,
+	vf_open,
 	NULL
 };
diff --git a/libmpcodecs/vf_dsize.c b/libmpcodecs/vf_dsize.c
index 6e451d540b..e4c519389a 100644
--- a/libmpcodecs/vf_dsize.c
+++ b/libmpcodecs/vf_dsize.c
@@ -79,7 +79,7 @@ static void uninit(vf_instance_t *vf) {
 	vf->priv = NULL;
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	vf->config = config;
 	vf->draw_slice = vf_next_draw_slice;
@@ -118,6 +118,6 @@ const vf_info_t vf_info_dsize = {
     "dsize",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_dvbscale.c b/libmpcodecs/vf_dvbscale.c
index e7ced30a34..f7c95015a2 100644
--- a/libmpcodecs/vf_dvbscale.c
+++ b/libmpcodecs/vf_dvbscale.c
@@ -46,7 +46,7 @@ static int config(struct vf_instance* vf,
     return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->default_caps=0;
     vf->priv=malloc(sizeof(struct vf_priv_s));
@@ -60,7 +60,7 @@ const vf_info_t vf_info_dvbscale = {
     "dvbscale",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_eq.c b/libmpcodecs/vf_eq.c
index 34f57d9311..167cf28074 100644
--- a/libmpcodecs/vf_eq.c
+++ b/libmpcodecs/vf_eq.c
@@ -219,7 +219,7 @@ static void uninit(struct vf_instance* vf)
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	vf->control=control;
 	vf->query_format=query_format;
@@ -253,6 +253,6 @@ const vf_info_t vf_info_eq = {
 	"eq",
 	"Richard Felker",
 	"",
-	open,
+	vf_open,
 	&vf_opts
 };
diff --git a/libmpcodecs/vf_eq2.c b/libmpcodecs/vf_eq2.c
index 45d3f61b0b..099acc85a0 100644
--- a/libmpcodecs/vf_eq2.c
+++ b/libmpcodecs/vf_eq2.c
@@ -446,7 +446,7 @@ void uninit (vf_instance_t *vf)
 }
 
 static
-int open (vf_instance_t *vf, char *args)
+int vf_open(vf_instance_t *vf, char *args)
 {
   unsigned i;
   vf_eq2_t *eq2;
@@ -514,6 +514,6 @@ const vf_info_t vf_info_eq2 = {
   "eq2",
   "Hampa Hug, Daniel Moreno, Richard Felker",
   "",
-  &open,
+  &vf_open,
   NULL
 };
diff --git a/libmpcodecs/vf_expand.c b/libmpcodecs/vf_expand.c
index fb41464f7e..c67b844273 100644
--- a/libmpcodecs/vf_expand.c
+++ b/libmpcodecs/vf_expand.c
@@ -462,7 +462,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt){
   return vf_next_query_format(vf,fmt);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->control=control;
     vf->query_format=query_format;
@@ -511,7 +511,7 @@ const vf_info_t vf_info_expand = {
     "expand",
     "A'rpi",
     "",
-    open,
+    vf_open,
     &vf_opts
 };
 
diff --git a/libmpcodecs/vf_field.c b/libmpcodecs/vf_field.c
index 3640da1073..b58fb206f2 100644
--- a/libmpcodecs/vf_field.c
+++ b/libmpcodecs/vf_field.c
@@ -66,7 +66,7 @@ static void uninit(struct vf_instance* vf)
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->uninit=uninit;
@@ -82,7 +82,7 @@ const vf_info_t vf_info_field = {
     "field",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_fil.c b/libmpcodecs/vf_fil.c
index 60bb28b6a7..4b935cbd04 100644
--- a/libmpcodecs/vf_fil.c
+++ b/libmpcodecs/vf_fil.c
@@ -94,7 +94,7 @@ static void uninit(struct vf_instance* vf)
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->uninit=uninit;
@@ -109,7 +109,7 @@ const vf_info_t vf_info_fil = {
     "fil",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_filmdint.c b/libmpcodecs/vf_filmdint.c
index 33fd868654..24ef2d14f7 100644
--- a/libmpcodecs/vf_filmdint.c
+++ b/libmpcodecs/vf_filmdint.c
@@ -1405,7 +1405,7 @@ static void uninit(struct vf_instance* vf)
     free(p);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
     struct vf_priv_s *p;
     vf->get_image = get_image;
@@ -1457,6 +1457,6 @@ const vf_info_t vf_info_filmdint = {
     "filmdint",
     "Zoltan Hidvegi",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_flip.c b/libmpcodecs/vf_flip.c
index a6663600b9..801b4a71e3 100644
--- a/libmpcodecs/vf_flip.c
+++ b/libmpcodecs/vf_flip.c
@@ -90,7 +90,7 @@ static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
 
 //===========================================================================//
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->get_image=get_image;
     vf->put_image=put_image;
@@ -103,7 +103,7 @@ const vf_info_t vf_info_flip = {
     "flip",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_format.c b/libmpcodecs/vf_format.c
index 8711d2acef..012ed08a01 100644
--- a/libmpcodecs/vf_format.c
+++ b/libmpcodecs/vf_format.c
@@ -46,7 +46,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt){
     return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->query_format=query_format;
     vf->default_caps=0;
     return 1;
@@ -70,7 +70,7 @@ const vf_info_t vf_info_format = {
     "format",
     "A'rpi",
     "FIXME! get_image()/put_image()",
-    open,
+    vf_open,
     &vf_opts
 };
 
diff --git a/libmpcodecs/vf_framestep.c b/libmpcodecs/vf_framestep.c
index 2c3d5ad2f9..7515a6659a 100644
--- a/libmpcodecs/vf_framestep.c
+++ b/libmpcodecs/vf_framestep.c
@@ -153,7 +153,7 @@ static void uninit(struct vf_instance* vf)
 }
 
 /* Main entry funct for the filter */
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	struct vf_priv_s *p;
 
@@ -200,6 +200,6 @@ const vf_info_t vf_info_framestep = {
     "framestep",
     "Daniele Forghieri",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_fspp.c b/libmpcodecs/vf_fspp.c
index a2507a22f0..1d8850c48c 100644
--- a/libmpcodecs/vf_fspp.c
+++ b/libmpcodecs/vf_fspp.c
@@ -622,7 +622,7 @@ static int control(struct vf_instance* vf, int request, void* data)
     return vf_next_control(vf,request,data);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
     int i=0, bias;
     int custom_threshold_m[64];
@@ -683,7 +683,7 @@ const vf_info_t vf_info_fspp = {
     "fspp",
     "Michael Niedermayer, Nikolaj Poroshin",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_geq.c b/libmpcodecs/vf_geq.c
index d2cbe6554b..1cd7b59f31 100644
--- a/libmpcodecs/vf_geq.c
+++ b/libmpcodecs/vf_geq.c
@@ -134,7 +134,7 @@ static void uninit(struct vf_instance* vf){
 }
 
 //===========================================================================//
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     char eq[3][2000] = { { 0 }, { 0 }, { 0 } };
     int plane;
 
@@ -193,6 +193,6 @@ const vf_info_t vf_info_geq = {
     "geq",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_gradfun.c b/libmpcodecs/vf_gradfun.c
index 83ae6fb9d6..66d921a4c1 100644
--- a/libmpcodecs/vf_gradfun.c
+++ b/libmpcodecs/vf_gradfun.c
@@ -364,7 +364,7 @@ static void uninit(struct vf_instance *vf)
     vf->priv = NULL;
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
     float thresh = 1.2;
     int radius = 16;
@@ -402,6 +402,6 @@ const vf_info_t vf_info_gradfun = {
     "gradfun",
     "Loren Merritt",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_halfpack.c b/libmpcodecs/vf_halfpack.c
index 3c8a6b580a..ef36777986 100644
--- a/libmpcodecs/vf_halfpack.c
+++ b/libmpcodecs/vf_halfpack.c
@@ -226,7 +226,7 @@ static void uninit(struct vf_instance* vf)
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	vf->config=config;
 	vf->query_format=query_format;
@@ -249,6 +249,6 @@ const vf_info_t vf_info_halfpack = {
 	"halfpack",
 	"Richard Felker",
 	"",
-	open,
+	vf_open,
 	NULL
 };
diff --git a/libmpcodecs/vf_harddup.c b/libmpcodecs/vf_harddup.c
index 07d47a1737..484b5fbd75 100644
--- a/libmpcodecs/vf_harddup.c
+++ b/libmpcodecs/vf_harddup.c
@@ -73,7 +73,7 @@ static void uninit(struct vf_instance* vf)
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	vf->put_image = put_image;
 	vf->control = control;
@@ -87,6 +87,6 @@ const vf_info_t vf_info_harddup = {
     "harddup",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_hqdn3d.c b/libmpcodecs/vf_hqdn3d.c
index a62854c2da..16105a0547 100644
--- a/libmpcodecs/vf_hqdn3d.c
+++ b/libmpcodecs/vf_hqdn3d.c
@@ -273,7 +273,7 @@ static void PrecalcCoefs(int *Ct, double Dist25)
 }
 
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
         double LumSpac, LumTmp, ChromSpac, ChromTmp;
         double Param1, Param2, Param3, Param4;
 
@@ -360,7 +360,7 @@ const vf_info_t vf_info_hqdn3d = {
     "hqdn3d",
     "Daniel Moreno & A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_hue.c b/libmpcodecs/vf_hue.c
index bc7ab21d34..4b12d7e457 100644
--- a/libmpcodecs/vf_hue.c
+++ b/libmpcodecs/vf_hue.c
@@ -163,7 +163,7 @@ static void uninit(struct vf_instance* vf)
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	vf->control=control;
 	vf->query_format=query_format;
@@ -195,6 +195,6 @@ const vf_info_t vf_info_hue = {
 	"hue",
 	"Michael Niedermayer",
 	"",
-	open,
+	vf_open,
 	&vf_opts
 };
diff --git a/libmpcodecs/vf_il.c b/libmpcodecs/vf_il.c
index 724dedb2d0..19c97d89a6 100644
--- a/libmpcodecs/vf_il.c
+++ b/libmpcodecs/vf_il.c
@@ -119,7 +119,7 @@ static void parse(FilterParam *fp, char* args){
 	if(pos && pos<max) fp->interleave=-1;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 
 	vf->put_image=put_image;
 //	vf->get_image=get_image;
@@ -141,7 +141,7 @@ const vf_info_t vf_info_il = {
     "il",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_ilpack.c b/libmpcodecs/vf_ilpack.c
index 0e0e48aefc..5987d9a150 100644
--- a/libmpcodecs/vf_ilpack.c
+++ b/libmpcodecs/vf_ilpack.c
@@ -404,7 +404,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt)
 	return 0;
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	vf->config=config;
 	vf->query_format=query_format;
@@ -448,6 +448,6 @@ const vf_info_t vf_info_ilpack = {
 	"ilpack",
 	"Richard Felker",
 	"",
-	open,
+	vf_open,
 	NULL
 };
diff --git a/libmpcodecs/vf_ivtc.c b/libmpcodecs/vf_ivtc.c
index d8db3b006f..a391987740 100644
--- a/libmpcodecs/vf_ivtc.c
+++ b/libmpcodecs/vf_ivtc.c
@@ -522,7 +522,7 @@ static void uninit(struct vf_instance* vf)
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	struct vf_priv_s *p;
 	vf->put_image = put_image;
@@ -545,6 +545,6 @@ const vf_info_t vf_info_ivtc = {
     "ivtc",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_kerndeint.c b/libmpcodecs/vf_kerndeint.c
index 359dfb9469..e0a3e3097d 100644
--- a/libmpcodecs/vf_kerndeint.c
+++ b/libmpcodecs/vf_kerndeint.c
@@ -302,7 +302,7 @@ static int control(struct vf_instance* vf, int request, void* data){
 	return vf_next_control (vf, request, data);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 
 	vf->control=control;
 	vf->config=config;
@@ -338,7 +338,7 @@ const vf_info_t vf_info_kerndeint = {
     "kerndeint",
     "Donald Graft",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_lavc.c b/libmpcodecs/vf_lavc.c
index 767aeda8f4..e748524886 100644
--- a/libmpcodecs/vf_lavc.c
+++ b/libmpcodecs/vf_lavc.c
@@ -130,7 +130,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt){
     return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     int p_quality=0;
     float p_fps=0;
 
@@ -180,7 +180,7 @@ const vf_info_t vf_info_lavc = {
     "lavc",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_lavcdeint.c b/libmpcodecs/vf_lavcdeint.c
index 7f1d764b1c..669bd8c622 100644
--- a/libmpcodecs/vf_lavcdeint.c
+++ b/libmpcodecs/vf_lavcdeint.c
@@ -161,7 +161,7 @@ query_format (struct vf_instance* vf, unsigned int fmt)
 
 
 static int
-open (vf_instance_t *vf, char* args)
+vf_open(vf_instance_t *vf, char *args)
 {
   /* We don't have any args */
   (void) args;
@@ -192,7 +192,7 @@ const vf_info_t vf_info_lavcdeint = {
     "Joe Rabinoff",
     "libavcodec's internal deinterlacer, in case you don't like "
       "the builtin ones (invoked with -pp or -npp)",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_mcdeint.c b/libmpcodecs/vf_mcdeint.c
index 1dbe096349..9bef101d42 100644
--- a/libmpcodecs/vf_mcdeint.c
+++ b/libmpcodecs/vf_mcdeint.c
@@ -301,7 +301,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt){
     return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 
     vf->config=config;
     vf->put_image=put_image;
@@ -328,6 +328,6 @@ const vf_info_t vf_info_mcdeint = {
     "mcdeint",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_mirror.c b/libmpcodecs/vf_mirror.c
index 36441ddedb..eecc186584 100644
--- a/libmpcodecs/vf_mirror.c
+++ b/libmpcodecs/vf_mirror.c
@@ -113,7 +113,7 @@ static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
 
 //===========================================================================//
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     //vf->config=config;
     vf->put_image=put_image;
     return 1;
@@ -124,7 +124,7 @@ const vf_info_t vf_info_mirror = {
     "mirror",
     "Eyck",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_noformat.c b/libmpcodecs/vf_noformat.c
index dfceb8c906..a48e728a8d 100644
--- a/libmpcodecs/vf_noformat.c
+++ b/libmpcodecs/vf_noformat.c
@@ -46,7 +46,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt){
     return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->query_format=query_format;
     vf->default_caps=0;
     return 1;
@@ -70,7 +70,7 @@ const vf_info_t vf_info_noformat = {
     "noformat",
     "Joey",
     "",
-    open,
+    vf_open,
     &vf_opts
 };
 
diff --git a/libmpcodecs/vf_noise.c b/libmpcodecs/vf_noise.c
index 6fdc5e20c5..9242df8339 100644
--- a/libmpcodecs/vf_noise.c
+++ b/libmpcodecs/vf_noise.c
@@ -423,7 +423,7 @@ static const unsigned int fmt_list[]={
     0
 };
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->get_image=get_image;
@@ -466,7 +466,7 @@ const vf_info_t vf_info_noise = {
     "noise",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_ow.c b/libmpcodecs/vf_ow.c
index 16d6ccbc56..db9ff742c5 100644
--- a/libmpcodecs/vf_ow.c
+++ b/libmpcodecs/vf_ow.c
@@ -289,7 +289,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt){
 }
 
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->get_image=get_image;
@@ -317,6 +317,6 @@ const vf_info_t vf_info_ow = {
     "ow",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_palette.c b/libmpcodecs/vf_palette.c
index 52bf3ceefc..2e13f9c902 100644
--- a/libmpcodecs/vf_palette.c
+++ b/libmpcodecs/vf_palette.c
@@ -188,7 +188,7 @@ static void uninit(vf_instance_t *vf) {
   free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     unsigned int i;
     vf->config=config;
     vf->uninit=uninit;
@@ -220,7 +220,7 @@ const vf_info_t vf_info_palette = {
     "palette",
     "A'rpi & Alex",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_perspective.c b/libmpcodecs/vf_perspective.c
index daba3cd2a9..2ea5aa3d50 100644
--- a/libmpcodecs/vf_perspective.c
+++ b/libmpcodecs/vf_perspective.c
@@ -304,7 +304,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt){
 	return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 	int e;
 
 	vf->config=config;
@@ -336,7 +336,7 @@ const vf_info_t vf_info_perspective = {
     "perspective",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_phase.c b/libmpcodecs/vf_phase.c
index b299905373..31f354e796 100644
--- a/libmpcodecs/vf_phase.c
+++ b/libmpcodecs/vf_phase.c
@@ -248,7 +248,7 @@ static void uninit(struct vf_instance* vf)
    free(vf->priv);
    }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
    {
    vf->put_image = put_image;
    vf->uninit = uninit;
@@ -296,6 +296,6 @@ const vf_info_t vf_info_phase =
    "phase",
    "Ville Saari",
    "",
-   open,
+   vf_open,
    NULL
    };
diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c
index 8ede366973..0a7975adf3 100644
--- a/libmpcodecs/vf_pp.c
+++ b/libmpcodecs/vf_pp.c
@@ -161,7 +161,7 @@ static const unsigned int fmt_list[]={
     0
 };
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     char *endptr, *name;
     int i;
     int hex_mode=0;
@@ -204,7 +204,7 @@ const vf_info_t vf_info_pp = {
     "pp",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_pp7.c b/libmpcodecs/vf_pp7.c
index 56b196a3a3..da26bf0fb7 100644
--- a/libmpcodecs/vf_pp7.c
+++ b/libmpcodecs/vf_pp7.c
@@ -440,7 +440,7 @@ static int control(struct vf_instance* vf, int request, void* data){
     return vf_next_control(vf,request,data);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->get_image=get_image;
@@ -486,6 +486,6 @@ const vf_info_t vf_info_pp7 = {
     "pp7",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_pullup.c b/libmpcodecs/vf_pullup.c
index fe84307458..0d2c345c9c 100644
--- a/libmpcodecs/vf_pullup.c
+++ b/libmpcodecs/vf_pullup.c
@@ -280,7 +280,7 @@ static void uninit(struct vf_instance* vf)
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	struct vf_priv_s *p;
 	struct pullup_context *c;
@@ -309,6 +309,6 @@ const vf_info_t vf_info_pullup = {
     "pullup",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_qp.c b/libmpcodecs/vf_qp.c
index ec0646265f..dbbf5134d1 100644
--- a/libmpcodecs/vf_qp.c
+++ b/libmpcodecs/vf_qp.c
@@ -147,7 +147,7 @@ static void uninit(struct vf_instance* vf){
 }
 
 //===========================================================================//
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->get_image=get_image;
@@ -167,6 +167,6 @@ const vf_info_t vf_info_qp = {
     "qp",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_rectangle.c b/libmpcodecs/vf_rectangle.c
index c80c3a0f39..437480a8dc 100644
--- a/libmpcodecs/vf_rectangle.c
+++ b/libmpcodecs/vf_rectangle.c
@@ -156,7 +156,7 @@ put_image(struct vf_instance* vf, mp_image_t* mpi, double pts){
 }
 
 static int
-open(vf_instance_t* vf, char* args) {
+vf_open(vf_instance_t *vf, char *args) {
     vf->config = config;
     vf->control = control;
     vf->put_image = put_image;
@@ -176,6 +176,6 @@ const vf_info_t vf_info_rectangle = {
     "rectangle",
     "Kim Minh Kaplan",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_remove_logo.c b/libmpcodecs/vf_remove_logo.c
index 8397ae53cf..711606f922 100644
--- a/libmpcodecs/vf_remove_logo.c
+++ b/libmpcodecs/vf_remove_logo.c
@@ -828,7 +828,7 @@ static int query_format(struct vf_instance * vf, unsigned int fmt)
  *
  * This sets up our instance variables and parses the arguments to the filter.
  */
-static int open(vf_instance_t * vf, char * args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
   vf->priv = safe_malloc(sizeof(vf_priv_s));
 
@@ -898,7 +898,7 @@ const vf_info_t vf_info_remove_logo = {
     "remove-logo",
     "Robert Edele",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_rgb2bgr.c b/libmpcodecs/vf_rgb2bgr.c
index b1fa17d098..5b8dd0fe34 100644
--- a/libmpcodecs/vf_rgb2bgr.c
+++ b/libmpcodecs/vf_rgb2bgr.c
@@ -100,7 +100,7 @@ static int query_format(struct vf_instance* vf, unsigned int outfmt){
     return vf_next_query_format(vf,fmt) & (~VFCAP_CSP_SUPPORTED_BY_HW);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;
@@ -114,7 +114,7 @@ const vf_info_t vf_info_rgb2bgr = {
     "rgb2bgr",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_rgbtest.c b/libmpcodecs/vf_rgbtest.c
index 1252b4018a..b7fc3aa55a 100644
--- a/libmpcodecs/vf_rgbtest.c
+++ b/libmpcodecs/vf_rgbtest.c
@@ -140,7 +140,7 @@ static int query_format(struct vf_instance* vf, unsigned int outfmt){
     return vf_next_query_format(vf,fmt) & (~VFCAP_CSP_SUPPORTED_BY_HW);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;
@@ -156,7 +156,7 @@ const vf_info_t vf_info_rgbtest = {
     "rgbtest",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_rotate.c b/libmpcodecs/vf_rotate.c
index 6a4672aa84..f1ee0476bd 100644
--- a/libmpcodecs/vf_rotate.c
+++ b/libmpcodecs/vf_rotate.c
@@ -131,7 +131,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt){
     return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;
@@ -145,7 +145,7 @@ const vf_info_t vf_info_rotate = {
     "rotate",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_sab.c b/libmpcodecs/vf_sab.c
index 839392d9e0..9b869cd269 100644
--- a/libmpcodecs/vf_sab.c
+++ b/libmpcodecs/vf_sab.c
@@ -272,7 +272,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt){
 	return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 	int e;
 
 	vf->config=config;
@@ -314,7 +314,7 @@ const vf_info_t vf_info_sab = {
     "sab",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c
index 208136e812..6a661c567e 100644
--- a/libmpcodecs/vf_scale.c
+++ b/libmpcodecs/vf_scale.c
@@ -562,7 +562,7 @@ static void uninit(struct vf_instance *vf){
     free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->start_slice=start_slice;
     vf->draw_slice=draw_slice;
@@ -723,7 +723,7 @@ const vf_info_t vf_info_scale = {
     "scale",
     "A'rpi",
     "",
-    open,
+    vf_open,
     &vf_opts
 };
 
diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c
index a661ada3ab..7ab25305ef 100644
--- a/libmpcodecs/vf_screenshot.c
+++ b/libmpcodecs/vf_screenshot.c
@@ -282,8 +282,7 @@ static void uninit(vf_instance_t *vf)
     free(vf->priv);
 }
 
-// open conflicts with stdio.h at least under MinGW
-static int screenshot_open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
     vf->config=config;
     vf->control=control;
@@ -315,7 +314,7 @@ const vf_info_t vf_info_screenshot = {
     "screenshot",
     "A'rpi, Jindrich Makovicka",
     "",
-    screenshot_open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_smartblur.c b/libmpcodecs/vf_smartblur.c
index 92aeece529..1961a95a5b 100644
--- a/libmpcodecs/vf_smartblur.c
+++ b/libmpcodecs/vf_smartblur.c
@@ -216,7 +216,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt){
 	return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 	int e;
 
 	vf->config=config;
@@ -255,7 +255,7 @@ const vf_info_t vf_info_smartblur = {
     "smartblur",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_softpulldown.c b/libmpcodecs/vf_softpulldown.c
index f9b32b8194..a15a43d6c6 100644
--- a/libmpcodecs/vf_softpulldown.c
+++ b/libmpcodecs/vf_softpulldown.c
@@ -142,7 +142,7 @@ static void uninit(struct vf_instance* vf)
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	struct vf_priv_s *p;
 	vf->config = config;
@@ -159,6 +159,6 @@ const vf_info_t vf_info_softpulldown = {
     "softpulldown",
     "Tobias Diedrich <ranma+mplayer@tdiedrich.de>",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_softskip.c b/libmpcodecs/vf_softskip.c
index 664a862d9a..ac7caf009b 100644
--- a/libmpcodecs/vf_softskip.c
+++ b/libmpcodecs/vf_softskip.c
@@ -83,7 +83,7 @@ static void uninit(struct vf_instance* vf)
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	vf->put_image = put_image;
 	vf->control = control;
@@ -97,6 +97,6 @@ const vf_info_t vf_info_softskip = {
     "softskip",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_spp.c b/libmpcodecs/vf_spp.c
index c04e3b1e1f..d1951fe718 100644
--- a/libmpcodecs/vf_spp.c
+++ b/libmpcodecs/vf_spp.c
@@ -557,7 +557,7 @@ static int control(struct vf_instance* vf, int request, void* data){
     return vf_next_control(vf,request,data);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 
     int log2c=-1;
 
@@ -609,6 +609,6 @@ const vf_info_t vf_info_spp = {
     "spp",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_swapuv.c b/libmpcodecs/vf_swapuv.c
index 5276c752f4..3c7e149001 100644
--- a/libmpcodecs/vf_swapuv.c
+++ b/libmpcodecs/vf_swapuv.c
@@ -87,7 +87,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt){
 	return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->put_image=put_image;
     vf->get_image=get_image;
     vf->query_format=query_format;
@@ -99,7 +99,7 @@ const vf_info_t vf_info_swapuv = {
     "swapuv",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_telecine.c b/libmpcodecs/vf_telecine.c
index b08a455486..9c08e08899 100644
--- a/libmpcodecs/vf_telecine.c
+++ b/libmpcodecs/vf_telecine.c
@@ -131,7 +131,7 @@ static void uninit(struct vf_instance* vf)
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	//vf->config = config;
 	vf->put_image = put_image;
@@ -150,6 +150,6 @@ const vf_info_t vf_info_telecine = {
     "telecine",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_test.c b/libmpcodecs/vf_test.c
index a59f5c37b2..e564e305f9 100644
--- a/libmpcodecs/vf_test.c
+++ b/libmpcodecs/vf_test.c
@@ -311,7 +311,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt){
     return vf_next_query_format(vf,IMGFMT_YV12) & (~VFCAP_CSP_SUPPORTED_BY_HW);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;
@@ -326,7 +326,7 @@ const vf_info_t vf_info_test = {
     "test",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_tfields.c b/libmpcodecs/vf_tfields.c
index e687fdaff3..415977bddc 100644
--- a/libmpcodecs/vf_tfields.c
+++ b/libmpcodecs/vf_tfields.c
@@ -487,7 +487,7 @@ static void uninit(struct vf_instance* vf)
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	struct vf_priv_s *p;
 	vf->config = config;
@@ -521,6 +521,6 @@ const vf_info_t vf_info_tfields = {
     "tfields",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_tile.c b/libmpcodecs/vf_tile.c
index 8e9cc7e650..dfad6a7098 100644
--- a/libmpcodecs/vf_tile.c
+++ b/libmpcodecs/vf_tile.c
@@ -231,7 +231,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt)
  * If the value is less then 0 def_val is used.
  * Return 0 for ok
  *
- * Look below ( in open(...) ) for a use ...
+ * Look below ( in vf_open(...) ) for a use ...
  */
 static int parse_int(char **s, int *rt, int def_val)
 {
@@ -266,7 +266,7 @@ static int parse_int(char **s, int *rt, int def_val)
 }
 
 /* Main entry funct for the filter */
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
     struct vf_priv_s *p;
     int              er;
@@ -323,6 +323,6 @@ const vf_info_t vf_info_tile = {
     "tile",
     "Daniele Forghieri",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_tinterlace.c b/libmpcodecs/vf_tinterlace.c
index fa69986856..24c8c06017 100644
--- a/libmpcodecs/vf_tinterlace.c
+++ b/libmpcodecs/vf_tinterlace.c
@@ -209,7 +209,7 @@ static void uninit(struct vf_instance* vf)
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	struct vf_priv_s *p;
 	vf->config = config;
@@ -230,6 +230,6 @@ const vf_info_t vf_info_tinterlace = {
 	"tinterlace",
 	"Michael Zucchi",
 	"",
-	open,
+	vf_open,
 	NULL
 };
diff --git a/libmpcodecs/vf_unsharp.c b/libmpcodecs/vf_unsharp.c
index 09d276d3d7..2afd866342 100644
--- a/libmpcodecs/vf_unsharp.c
+++ b/libmpcodecs/vf_unsharp.c
@@ -270,7 +270,7 @@ static const unsigned int fmt_list[] = {
     0
 };
 
-static int open( vf_instance_t *vf, char* args ) {
+static int vf_open( vf_instance_t *vf, char *args ) {
     vf->config       = config;
     vf->put_image    = put_image;
     vf->get_image    = get_image;
@@ -317,7 +317,7 @@ const vf_info_t vf_info_unsharp = {
     "unsharp",
     "Remi Guyomarch",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_uspp.c b/libmpcodecs/vf_uspp.c
index 8ff3413422..1a7d4402a2 100644
--- a/libmpcodecs/vf_uspp.c
+++ b/libmpcodecs/vf_uspp.c
@@ -340,7 +340,7 @@ static int control(struct vf_instance* vf, int request, void* data){
     return vf_next_control(vf,request,data);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 
     int log2c=-1;
 
@@ -380,6 +380,6 @@ const vf_info_t vf_info_uspp = {
     "uspp",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c
index 597d787e52..adee2a3a4c 100644
--- a/libmpcodecs/vf_vo.c
+++ b/libmpcodecs/vf_vo.c
@@ -231,7 +231,7 @@ static void uninit(struct vf_instance* vf)
 }
 //===========================================================================//
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->control=control;
     vf->query_format=query_format;
@@ -251,7 +251,7 @@ const vf_info_t vf_info_vo = {
     "vo",
     "A'rpi",
     "for internal use",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_yadif.c b/libmpcodecs/vf_yadif.c
index 477ea03c9b..e1a08c737a 100644
--- a/libmpcodecs/vf_yadif.c
+++ b/libmpcodecs/vf_yadif.c
@@ -479,7 +479,7 @@ static int control(struct vf_instance* vf, int request, void* data){
     return vf_next_control (vf, request, data);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 
     vf->config=config;
     vf->put_image=put_image;
@@ -508,6 +508,6 @@ const vf_info_t vf_info_yadif = {
     "yadif",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpcodecs/vf_yuvcsp.c b/libmpcodecs/vf_yuvcsp.c
index 7fe176b00e..db310a1da9 100644
--- a/libmpcodecs/vf_yuvcsp.c
+++ b/libmpcodecs/vf_yuvcsp.c
@@ -97,7 +97,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt){
     return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
 //    vf->uninit=uninit;
@@ -113,7 +113,7 @@ const vf_info_t vf_info_yuvcsp = {
     "yuvcsp",
     "Alex Beregszaszi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_yuy2.c b/libmpcodecs/vf_yuy2.c
index 8e1b6f0c8c..6ce3f05420 100644
--- a/libmpcodecs/vf_yuy2.c
+++ b/libmpcodecs/vf_yuy2.c
@@ -81,7 +81,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt){
     return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;
@@ -93,7 +93,7 @@ const vf_info_t vf_info_yuy2 = {
     "yuy2",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_yvu9.c b/libmpcodecs/vf_yvu9.c
index bbae017ef8..349e72c3d5 100644
--- a/libmpcodecs/vf_yvu9.c
+++ b/libmpcodecs/vf_yvu9.c
@@ -86,7 +86,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt){
     return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;
@@ -98,7 +98,7 @@ const vf_info_t vf_info_yvu9 = {
     "yvu9",
     "alex",
     "",
-    open,
+    vf_open,
     NULL
 };
 
diff --git a/libmpcodecs/vf_zrmjpeg.c b/libmpcodecs/vf_zrmjpeg.c
index 31f51e7765..3d90052b5e 100644
--- a/libmpcodecs/vf_zrmjpeg.c
+++ b/libmpcodecs/vf_zrmjpeg.c
@@ -893,9 +893,9 @@ static void uninit(vf_instance_t *vf) {
  * This routine will do some basic initialization of local structures etc.,
  * and then parse the command line arguments specific for the ZRMJPEG filter.
  */
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 	struct vf_priv_s *priv;
-	VERBOSE("open() called: args=\"%s\"\n", args);
+	VERBOSE("vf_open() called: args=\"%s\"\n", args);
 
 	vf->config = config;
 	vf->put_image = put_image;
@@ -1062,6 +1062,6 @@ const vf_info_t vf_info_zrmjpeg = {
     "zrmjpeg",
     "Rik Snel",
     "",
-    open,
+    vf_open,
     NULL
 };
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index eab8316e02..adfe1059b2 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -33,6 +33,8 @@ static const struct mp_AVCodecTag mp_wav_tags[] = {
     { CODEC_ID_ADPCM_THP,         MKTAG('T', 'H', 'P', 'A')},
     { CODEC_ID_ADPCM_XA,          MKTAG('P', 'S', 'X', 'A')},
     { CODEC_ID_AMR_NB,            MKTAG('n', 'b',   0,   0)},
+    { CODEC_ID_BINKAUDIO_DCT,     MKTAG('B', 'A', 'U', '1')},
+    { CODEC_ID_BINKAUDIO_RDFT,    MKTAG('B', 'A', 'U', '2')},
     { CODEC_ID_COOK,              MKTAG('c', 'o', 'o', 'k')},
     { CODEC_ID_DSICINAUDIO,       MKTAG('D', 'C', 'I', 'A')},
     { CODEC_ID_EAC3,              MKTAG('E', 'A', 'C', '3')},
diff --git a/libmpdemux/mpeg_hdr.c b/libmpdemux/mpeg_hdr.c
index c07cd6bf16..d91019ad13 100644
--- a/libmpdemux/mpeg_hdr.c
+++ b/libmpdemux/mpeg_hdr.c
@@ -67,6 +67,8 @@ int mp_header_process_sequence_header (mp_mpeg_header_t * picture, const unsigne
     picture->mpeg1 = 1;
     picture->picture_structure = 3; //FRAME_PICTURE;
     picture->display_time=100;
+    picture->frame_rate_extension_n = 1;
+    picture->frame_rate_extension_d = 1;
     return 0;
 }
 
@@ -81,6 +83,9 @@ static int header_process_sequence_extension (mp_mpeg_header_t * picture,
 	return 1;
 
     picture->progressive_sequence = (buffer[1] >> 3) & 1;
+    picture->frame_rate_extension_n = ((buffer[5] >> 5) & 3) + 1;
+    picture->frame_rate_extension_d = (buffer[5] & 0x1f) + 1;
+
     picture->mpeg1 = 0;
     return 0;
 }
diff --git a/libmpdemux/mpeg_hdr.h b/libmpdemux/mpeg_hdr.h
index d9922767b2..ccd84bcdb0 100644
--- a/libmpdemux/mpeg_hdr.h
+++ b/libmpdemux/mpeg_hdr.h
@@ -27,6 +27,8 @@ typedef struct {
     int aspect_ratio_information;
     int frame_rate_code;
     float fps;
+    int frame_rate_extension_n;
+    int frame_rate_extension_d;
     int bitrate; // 0x3FFFF==VBR
     // timing:
     int picture_structure;
diff --git a/libmpdemux/video.c b/libmpdemux/video.c
index 7ba2e8049f..f29f83bf9b 100644
--- a/libmpdemux/video.c
+++ b/libmpdemux/video.c
@@ -318,7 +318,7 @@ mpeg_header_parser:
 
    // display info:
    sh_video->format=picture.mpeg1?0x10000001:0x10000002; // mpeg video
-   sh_video->fps=picture.fps;
+   sh_video->fps=picture.fps * picture.frame_rate_extension_n / picture.frame_rate_extension_d;
    if(!sh_video->fps){
      sh_video->frametime=0;
    } else {
@@ -433,6 +433,7 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char**
     float frame_time=1;
     float pts1=d_video->pts;
     float pts=0;
+    float fps;
     int picture_coding_type=0;
     int in_size=0;
     video_codec_t video_codec = find_video_codec(sh_video);
@@ -469,14 +470,15 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char**
             case 0x100: picture_coding_type=(videobuffer[start+1] >> 3) & 7;break;
           }
         }
+        fps = picture.fps * picture.frame_rate_extension_n / picture.frame_rate_extension_d;
 
         *start=videobuffer; in_size=videobuf_len;
 
     // get mpeg fps:
-    if(sh_video->fps!=picture.fps) if(!force_fps && !telecine){
-            mp_msg(MSGT_CPLAYER,MSGL_WARN,"Warning! FPS changed %5.3f -> %5.3f  (%f) [%d]  \n",sh_video->fps,picture.fps,sh_video->fps-picture.fps,picture.frame_rate_code);
-            sh_video->fps=picture.fps;
-            sh_video->frametime=1.0/picture.fps;
+    if(sh_video->fps!=fps) if(!force_fps && !telecine){
+            mp_msg(MSGT_CPLAYER,MSGL_WARN,"Warning! FPS changed %5.3f -> %5.3f  (%f) [%d]  \n",sh_video->fps,fps,sh_video->fps-fps,picture.frame_rate_code);
+            sh_video->fps=fps;
+            sh_video->frametime=1.0/fps;
     }
 
     // fix mpeg2 frametime: