Merge svn changes up to r30683

86 files changed, 206 insertions, 165 deletions

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/