diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:44:57 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:44:57 +0200 |
commit | 89c5ed5e9a720b032af9a58263deda158e1cbf4d (patch) | |
tree | 2afd33bf8cd2692201b78a0a2da80824780efc63 | |
parent | 0670a5d0905db1e4bbf376cf005ca836f4d0e04b (diff) | |
parent | cdd0ab0da9818aeb527e35fe73ee57bdf3aa4f70 (diff) | |
download | mpv-89c5ed5e9a720b032af9a58263deda158e1cbf4d.tar.bz2 mpv-89c5ed5e9a720b032af9a58263deda158e1cbf4d.tar.xz |
Merge svn changes up to r30605
-rw-r--r-- | etc/codecs.conf | 7 | ||||
-rw-r--r-- | libmpdemux/mp_taglists.c | 1 | ||||
-rw-r--r-- | libvo/spuenc.c | 6 | ||||
-rw-r--r-- | libvo/spuenc.h | 7 | ||||
-rw-r--r-- | libvo/vo_dxr3.c | 6 |
5 files changed, 17 insertions, 10 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 85a212b027..41bc50d559 100644 --- a/etc/codecs.conf +++ b/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 diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index 4b7c8ed331..eab8316e02 100644 --- a/libmpdemux/mp_taglists.c +++ b/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')}, diff --git a/libvo/spuenc.c b/libvo/spuenc.c index bc35a06d18..10d93b0792 100644 --- a/libvo/spuenc.c +++ b/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; diff --git a/libvo/spuenc.h b/libvo/spuenc.h index 7f4590b4ac..39b999b2d8 100644 --- a/libvo/spuenc.h +++ b/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 */ diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index 898ee96756..b824f8b71e 100644 --- a/libvo/vo_dxr3.c +++ b/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; |