Merge svn changes up to r30605

etc/codecs.conf

@@ -3924,6 +3924,13 @@ audiocodec ffape
   driver ffmpeg
   dll "ape"
 
+audiocodec ffals
+  info "FFmpeg ALS"
+  status working
+  fourcc "ALS " ; internal MPlayer FourCC
+  driver ffmpeg
+  dll "als"
+
 audiocodec ffmlp
   info "FFmpeg MLP"
   status working

libmpdemux/mp_taglists.c

@@ -39,6 +39,7 @@ static const struct mp_AVCodecTag mp_wav_tags[] = {
     { CODEC_ID_INTERPLAY_DPCM,    MKTAG('I', 'N', 'P', 'A')},
     { CODEC_ID_MLP,               MKTAG('M', 'L', 'P', ' ')},
     { CODEC_ID_MP1,               0x50},
+    { CODEC_ID_MP4ALS,            MKTAG('A', 'L', 'S', ' ')},
     { CODEC_ID_MUSEPACK7,         MKTAG('M', 'P', 'C', ' ')},
     { CODEC_ID_MUSEPACK8,         MKTAG('M', 'P', 'C', '8')},
     { CODEC_ID_NELLYMOSER,        MKTAG('N', 'E', 'L', 'L')},

libvo/spuenc.c

@@ -31,6 +31,12 @@
 #include "unistd.h"
 #include "spuenc.h"
 
+typedef struct {
+	int x, y;
+	unsigned int rgb[4];
+	unsigned char* pixels;
+} pixbuf;
+
 static void
 encode_do_control(int x,int y, encodedata* ed, pixbuf* pb) {
 	int controlstart= ed->count;

libvo/spuenc.h

@@ -26,13 +26,6 @@
 #include <stdlib.h>
 #define DATASIZE 53220
 
-
-typedef struct {
-	int x, y;
-	unsigned int rgb[4];
-	unsigned char* pixels;
-} pixbuf;
-
 typedef struct {
 	unsigned char data[DATASIZE];
 	int count;	/* the count of bytes written */

libvo/vo_dxr3.c

@@ -437,13 +437,13 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_
 		mp_tmsg(MSGT_VO,MSGL_ERR, "[VO_DXR3] out of memory\n");
 		return -1;
 	}
-	spued = (encodedata *) malloc(sizeof(encodedata));
+	spued = malloc(sizeof(encodedata));
 	if (spued == NULL) {
 	        free( osdpicbuf );
 		mp_tmsg(MSGT_VO,MSGL_ERR, "[VO_DXR3] out of memory\n");
 		return -1;
 	}
-	spubuf = (encodedata *) malloc(sizeof(encodedata));
+	spubuf = malloc(sizeof(encodedata));
 	if (spubuf == NULL) {
 	        free( osdpicbuf );
 		free( spued );
@@ -903,7 +903,7 @@ static overlay_t *overlay_init(int dev)
 {
     overlay_t *o;
 
-    o = (overlay_t *) malloc(sizeof(overlay_t));
+    o = malloc(sizeof(overlay_t));
 
     if(!o)
 	return NULL;