diff -aur MPlayer-0.90rc2.orig/cfg-common.h MPlayer-0.90rc2/cfg-common.h
--- MPlayer-0.90rc2.orig/cfg-common.h 2002-12-23 08:33:05.000000000 +0800
+++ MPlayer-0.90rc2/cfg-common.h 2008-09-06 21:57:20.000000000 +0800
@@ -10,7 +10,7 @@
#endif
#ifdef HAVE_VCD
{"vcd", &vcd_track, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL},
- {"cdrom-device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
+// {"cdrom-device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
#else
{"vcd", "VCD support is NOT available on this system!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif
@@ -93,7 +93,6 @@
#else
{"tv", "MPlayer was compiled without TV Interface support\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
#endif
- {"vivo", vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
// ------------------------- a-v sync options --------------------
@@ -287,31 +286,6 @@
{NULL, NULL, 0, 0, 0, 0, NULL}
};
-/* VIVO demuxer options: */
-extern int vivo_param_version;
-extern char *vivo_param_acodec;
-extern int vivo_param_abitrate;
-extern int vivo_param_samplerate;
-extern int vivo_param_bytesperblock;
-extern int vivo_param_width;
-extern int vivo_param_height;
-extern int vivo_param_vformat;
-extern char *dvd_device, *cdrom_device;
-
-struct config vivoopts_conf[]={
- {"version", &vivo_param_version, CONF_TYPE_INT, 0, 0, 0, NULL},
- /* audio options */
- {"acodec", &vivo_param_acodec, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"abitrate", &vivo_param_abitrate, CONF_TYPE_INT, 0, 0, 0, NULL},
- {"samplerate", &vivo_param_samplerate, CONF_TYPE_INT, 0, 0, 0, NULL},
- {"bytesperblock", &vivo_param_bytesperblock, CONF_TYPE_INT, 0, 0, 0, NULL},
- /* video options */
- {"width", &vivo_param_width, CONF_TYPE_INT, 0, 0, 0, NULL},
- {"height", &vivo_param_height, CONF_TYPE_INT, 0, 0, 0, NULL},
- {"vformat", &vivo_param_vformat, CONF_TYPE_INT, 0, 0, 0, NULL},
- {NULL, NULL, 0, 0, 0, 0, NULL}
-};
-
extern int mf_support;
extern int mf_w;
extern int mf_h;
diff -aur MPlayer-0.90rc2.orig/codec-cfg.c MPlayer-0.90rc2/codec-cfg.c
--- MPlayer-0.90rc2.orig/codec-cfg.c 2002-12-16 10:22:37.000000000 +0800
+++ MPlayer-0.90rc2/codec-cfg.c 2008-09-06 21:57:20.000000000 +0800
@@ -233,7 +233,6 @@
{
static char *audiodrv[] = {
"null",
- "mp3lib",
"pcm",
"libac3",
"acm",
diff -aur MPlayer-0.90rc2.orig/configure MPlayer-0.90rc2/configure
--- MPlayer-0.90rc2.orig/configure 2002-12-23 08:33:05.000000000 +0800
+++ MPlayer-0.90rc2/configure 2008-09-06 21:57:20.000000000 +0800
@@ -1677,22 +1677,6 @@
echores "$_nanosleep"
-echocheck "socklib"
-# for Solaris (socket stuff is in -lsocket, gethostbyname and friends in -lnsl):
-cat > $TMPC << EOF
-#include <netdb.h>
-int main(void) { (void) gethostbyname(0); return 0; }
-EOF
-cc_check -lsocket && _ld_sock="-lsocket"
-cc_check -lnsl && _ld_sock="-lnsl"
-cc_check -lsocket -lnsl && _ld_sock="-lsocket -lnsl"
-if test "$_ld_sock" ; then
- echores "yes (using $_ld_sock)"
-else
- echores "no"
-fi
-
-
_use_aton=no
echocheck "inet_pton()"
cat > $TMPC << EOF
@@ -1895,35 +1879,6 @@
#echores "using $_ld_dl_dynamic"
-echocheck "pthread"
-cat > $TMPC << EOF
-#include <pthread.h>
-void* func(void *arg) { return arg; }
-int main(void) { pthread_t tid; return pthread_create (&tid, 0, func, 0) == 0 ? 0 : 1; }
-EOF
-if ( cc_check && $TMPO ) ; then # QNX
- _ld_pthread=''
-elif ( cc_check -lpthread && $TMPO ) ; then
- _ld_pthread='-lpthread'
-elif ( cc_check -pthread && $TMPO ) ; then
- _ld_pthread='-pthread'
-else
- if test "$_ld_static" ; then
- # for crosscompilation, we cannot execute the program, be happy if we can link statically
- if ( cc_check -lpthread ) ; then
- _ld_pthread='-lpthread'
- elif ( cc_check -pthread ) ; then
- _ld_pthread='-pthread'
- else
- die "Static lib pthread not found (needed by Windows and networking stufff)."
- fi
- else
- die "Lib pthread not found (needed by Windows and networking stuff)."
- fi
-fi
-echores "yes (using $_ld_pthread)"
-
-
echocheck "sys/soundcard.h"
cat > $TMPC << EOF
#include <sys/soundcard.h>
@@ -3389,7 +3344,7 @@
_dvdread=no
if test "$_dl" = yes; then
cc_check \
- -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -ldvdread $_ld_dl && \
+ -ldvdread $_ld_dl && \
_dvdread=yes
fi
fi
@@ -3541,7 +3496,7 @@
int main(void) { (void) inflate(0, Z_NO_FLUSH); return 0; }
EOF
_zlib=no
-cc_check -lz && _zlib=yes
+cc_check -lz && _zlib=no
if test "$_zlib" = yes ; then
_def_zlib='#define HAVE_ZLIB 1'
_ld_zlib='-lz'
@@ -4540,14 +4495,6 @@
# FIXME bsd needs this so maybe other OS'es
CFLAGS="$CFLAGS -D_THREAD_SAFE"
fi
-# 64 bit file offsets?
-if test "$_largefiles" = yes || freebsd ; then
- CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
- if test "$_dvdread" = yes ; then
- # dvdread support requires this (for off64_t)
- CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
- fi
-fi
echocheck "ftello()"
# if we dont have ftello map it to ftell
@@ -4983,12 +4930,12 @@
/* Use libavcodec's decoders */
#define CONFIG_DECODERS 1
/* Use libavcodec's encoders */
-#define CONFIG_ENCODERS 1
+//#define CONFIG_ENCODERS 1
/* Use codec libs included in mplayer CVS / source dist: */
-#define USE_MP3LIB
+//#define USE_MP3LIB
#define USE_LIBA52
-#define USE_LIBMPEG2
+//#define USE_LIBMPEG2
/* Use the SVQ1 decoder in libmpcodecs - we don't want/need it with libavcodec */
#ifndef USE_LIBAVCODEC
@@ -5181,7 +5128,7 @@
/* libmpeg2 uses a different feature test macro for mediaLib */
#ifdef HAVE_MLIB
-#define LIBMPEG2_MLIB 1
+//#define LIBMPEG2_MLIB 1
#endif
/* libvo options */
diff -aur MPlayer-0.90rc2.orig/cpudetect.c MPlayer-0.90rc2/cpudetect.c
--- MPlayer-0.90rc2.orig/cpudetect.c 2002-12-23 09:24:42.000000000 +0800
+++ MPlayer-0.90rc2/cpudetect.c 2008-09-06 21:57:20.000000000 +0800
@@ -165,31 +165,6 @@
// caps->has3DNow=1;
// caps->hasMMX2 = 0;
// caps->hasMMX = 0;
-
-#ifndef HAVE_MMX
- if(caps->hasMMX) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"MMX supported but disabled\n");
- caps->hasMMX=0;
-#endif
-#ifndef HAVE_MMX2
- if(caps->hasMMX2) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"MMX2 supported but disabled\n");
- caps->hasMMX2=0;
-#endif
-#ifndef HAVE_SSE
- if(caps->hasSSE) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"SSE supported but disabled\n");
- caps->hasSSE=0;
-#endif
-#ifndef HAVE_SSE2
- if(caps->hasSSE2) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"SSE2 supported but disabled\n");
- caps->hasSSE2=0;
-#endif
-#ifndef HAVE_3DNOW
- if(caps->has3DNow) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"3DNow supported but disabled\n");
- caps->has3DNow=0;
-#endif
-#ifndef HAVE_3DNOWEX
- if(caps->has3DNowExt) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"3DNowExt supported but disabled\n");
- caps->has3DNowExt=0;
-#endif
}
diff -aur MPlayer-0.90rc2.orig/etc/codecs.conf MPlayer-0.90rc2/etc/codecs.conf
--- MPlayer-0.90rc2.orig/etc/codecs.conf 2002-12-23 04:16:52.000000000 +0800
+++ MPlayer-0.90rc2/etc/codecs.conf 2008-09-06 21:57:20.000000000 +0800
@@ -10,26 +10,6 @@
;=============================================================================
; mpeg 1/2 decoding:
-; Note: mpegpes is preferred for hw decoders:
-
-videocodec mpegpes
- info "Mpeg PES output (.mpg or Dxr3/DVB card)"
- comment "for hardware decoding"
- status working
- format 0x10000001 ; mpeg 1
- format 0x10000002 ; mpeg 2
- driver mpegpes
- out MPES
-
-videocodec mpeg12
- info "MPEG 1 or 2 (libmpeg2)"
- comment "with postprocessing"
- status working
- format 0x10000001 ; mpeg 1
- format 0x10000002 ; mpeg 2
- driver libmpeg2
-; dll "libmpeg2"
- out YV12,I420,IYUV
videocodec ffmpeg12
info "FFmpeg MPEG 1/2"
@@ -42,211 +22,9 @@
dll "mpegvideo"
out YV12,I420,IYUV
-; we have only native opensource codecs for these:
-
-videocodec nuv
- info "NuppelVideo"
- status working
- fourcc NUV1
- driver nuv
- out I420,IYUV
-
-videocodec mpng
- info "PNG images decoder"
- status working
- comment "Gray scaled PNG with Alpha channel not supported"
- fourcc mpng,MPNG
- dll "libpng"
- driver mpng
- out BGR32,BGR24
-
-videocodec mtga
- info "TGA images decoder"
- status working
- comment "Only 24bpp and 32bpp RGB TGA files supported"
- fourcc mtga,MTGA
- driver mtga
- out BGR32,BGR24
-
-videocodec fli
- info "Autodesk FLI/FLC Animation"
- status working
- comment "FLIC is an internal MPlayer FOURCC"
- fourcc FLIC
- driver fli
- out BGR32,BGR24
-
-videocodec qtrle
- info "Quicktime Animation (RLE)"
- status working
- format 0x20656C72 ; "rle "
- driver qtrle
- out BGR32,BGR24,BGR15 query
-
-videocodec qtrpza
- info "Quicktime Apple Video"
- status working
- fourcc rpza,azpr
- driver qtrpza
- out BGR32,BGR24,BGR15
-
-videocodec qtsmc
- info "Apple Graphics (SMC) codec"
- status working
- format 0x20636d73 ; "smc "
- driver qtsmc
- out BGR32,BGR24
-
-videocodec cyuv
- info "Creative YUV (native codec)"
- status working
- fourcc cyuv,CYUV
- driver cyuv
- out 411P
- out YUY2,UYVY
- out 422P
-
-videocodec msrle
- info "Microsoft RLE"
- status working
- format 0x1
- format 0x2
- driver msrle
- out BGR32,BGR24,BGR16,BGR15
-
-videocodec roqvideo
- info "Id RoQ File Video Decoder"
- status buggy
- comment "buggy"
- fourcc RoQV ; RoQV is an internal MPlayer FOURCC
- driver roqvideo
- out YV12
-
-videocodec lzo
- info "LZO compressed"
- status working
- fourcc LZO1
- driver lzo
- dll "liblzo"
- out YV12,I420
- out BGR24 flip
-
-; prefer native codecs over win32?
-; the win32 codecs probably are (better) optimized and support direct
-; rendering, so this may be not the best idea...
-
-;WIN32:
-
-videocodec cram
- info "Microsoft Video 1"
- comment "-vop palette required for 8bpp"
- status buggy
- fourcc cram,CRAM CRAM
- fourcc msvc,MSVC CRAM
- fourcc wham,WHAM CRAM
- driver vfw
- dll "msvidc32.dll"
- out BGR24,BGR15,BGR8 static,query
-
-videocodec cvidvfw
- info "Cinepak Video"
- status working
- fourcc cvid
- driver vfw
- dll "iccvid.dll"
-; out YUY2
-; out UYVY
- out BGR24,BGR15 static
-
-videocodec huffyuv
- info "HuffYUV"
- status buggy
- fourcc HFYU
- driver vfw
- dll "huffyuv.dll"
- out YUY2 flip,noflip,query
-; out UYVY flip
- out BGR32,BGR24 flip,query
-
-;NATIVE:
-
-videocodec svq1
- info "Sorenson v1 (native codec)"
- status buggy
- fourcc SVQ1
- driver svq1
- out YVU9
-
-videocodec video1
- info "Microsoft Video 1 (native codec)"
- status working
- fourcc cram,CRAM
- fourcc msvc,MSVC
- fourcc wham,WHAM
- driver msvidc
- out BGR32,BGR24
-
-videocodec cvid
- info "Cinepak Video (native codec)"
- status working
- fourcc cvid,CVID
- driver cinepak
- out YV12,I420,IYUV
- out YUY2
- out BGR32,BGR24
-
-videocodec mphuffyuv
- info "HuffYUV (native codec)"
- status working
- fourcc HFYU
- driver huffyuv
- out YUY2
- out BGR32,BGR24
-
-videocodec mpmszh
- info "AVImszh (native codec)"
- status working
- fourcc MSZH
- driver lcl
- out BGR24
-
-videocodec mpzlib
- info "AVIzlib (native codec)"
- status working
- fourcc ZLIB
- driver lcl
- out BGR24
-
-;XAnim (slow):
-
-videocodec cvidxa
- info "XAnim's Radius Cinepak Video"
- status buggy
- fourcc cvid
- driver xanim
- dll "vid_cvid.xa"
- out YV12,IYUV,I420 static
-
; time to decide what to do with the mpeg4/divx variants...
; ff* is fastest...
-videocodec ffhuffyuv
- info "FFHuffYUV"
- status working
- fourcc HFYU
- driver ffmpeg
- dll huffyuv
- out YV12,YUY2,422P
- out BGR32,BGR24
-
-videocodec ffsvq1
- info "FFmpeg Sorenson Video v1"
- status working
- fourcc SVQ1
- driver ffmpeg
- dll svq1
- out YVU9
-
videocodec ffdivx
info "FFmpeg DivX ;-) (MS MPEG-4 v3)"
status working
@@ -305,365 +83,8 @@
dll mpeg4 ;opendivx
out YV12,I420,IYUV
-videocodec xvid
- info "Xvid (MPEG-4)"
- status working
- fourcc DIVX,divx
- fourcc xvid,XVID,XviD
- format 0x4
- driver xvid
- out YV12
- out I420
- out YUY2
- out UYVY
- out YVYU
- out BGR32,BGR24,BGR16,BGR15
- dll "libxvidcore.a"
-
-; divx4 does direct render, and is native on linux
-
-videocodec odivx
- info "OpenDivX API (ODIVX,DIVX4,DIVX5,XVID)"
- comment "with postprocessing"
- status working
- fourcc mp4v
- fourcc DIVX,divx
- fourcc DIV1,div1 divx
-; fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
- fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3 ; for DivX4Linux only!
- fourcc AP41 DIV3 ; AngelPotion stuff
- fourcc xvid,XVID,XviD
- fourcc DX50,BLZ0 DX50
- format 0x4
- driver odivx
- dll "libdivxdecore.so"
- out YV12,I420,IYUV
-
-videocodec divx4
- info "DivX4Linux API (DIVX4,DIVX5,XVID)"
- comment "with postprocessing"
- status working
- fourcc mp4v
- fourcc DIVX,divx
- fourcc DIV1,div1 divx
-; fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
- fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3 ; for DivX4Linux only!
- fourcc AP41 DIV3 ; AngelPotion stuff
- fourcc xvid,XVID,XviD
- fourcc DX50,BLZ0 DX50
- format 0x4
- driver divx4
- dll "libdivxdecore.so"
-; out I420 ; planar direct rendering
- out YUY2
- out UYVY
- out BGR32,BGR24,BGR16,BGR15
-
-; is divx4vfw stable enough, working everywhere and faster than divxds?
-
-videocodec divx4vfw
- info "DivX4Windows-VFW"
- status buggy
- comment "sig11 with -framedrop"
- fourcc DIVX,divx ; opendivx / divx4
- fourcc DIV1,div1 divx
-; fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
- fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3 ; for DivX4Linux only!
- fourcc AP41 DIV3 ; AngelPotion stuff
- format 0x4
- driver vfw
- dll "divx.dll"
-; out YV12 ; buggy
- out YUY2
- out BGR32,BGR24,BGR15
-
-; the original ones... prefer DShow for postprocessing:
-
-videocodec divxds
- info "DivX ;-) (MS MPEG-4 v3)"
- comment "with postprocessing"
- status working
- fourcc MP43,mp43 div3 ; fourcc mapping to div3
- fourcc DIV5,div5 div3
- fourcc DIV6,div6 div4
- fourcc DIV3,div3,DIV4,div4
- fourcc AP41 div3 ; AngelPotion stuff
- driver dshow
- dll "divx_c32.ax"
- guid 0x82CCd3E0, 0xF71A, 0x11D0, 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa
- out YUY2,UYVY
- out BGR32,BGR24,BGR16,BGR15
-
-videocodec divx
- info "DivX ;-) (MS MPEG-4 v3)"
- status working
- fourcc MP43,mp43 div3 ; M$ MPEG4 v3 (fourcc mapping to div3)
- fourcc DIV5,div5 div3 ; DivX 3.20
- fourcc DIV6,div6 div4 ; -||-
- fourcc DIV3,div3,DIV4,div4
- fourcc AP41 div3 ; AngelPotion stuff
- driver vfw
- dll "divxc32.dll"
- out YUY2 yuvhack
- out BGR32,BGR24,BGR15
-
-; hmm. we should check, maybe these are/will be playable with libavcodec:
-
-videocodec mpeg4ds
- info "Microsoft MPEG-4 v1/v2"
- status working
- comment "with postprocessing"
- fourcc DIV2,div2 mp42
- fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
- fourcc MPG4,mpg4
- fourcc MP42,mp42
- driver dshow
- dll "mpg4ds32.ax"
- guid 0x82CCD3E0, 0xF71A, 0x11D0, 0x9F, 0xE5, 0x00, 0x60, 0x97, 0x78, 0xEA, 0x66
- out YUY2
- out BGR32,BGR24,BGR16,BGR15
-
-videocodec mpeg4
- info "Microsoft MPEG-4 v1/v2"
- status working
- fourcc MPG4,mpg4
- fourcc MP42,mp42
- fourcc DIV2 mp42
- driver vfw
- dll "mpg4c32.dll"
- out YUY2 yuvhack
- out BGR32,BGR24,BGR15
-
-videocodec wmv8
- info "Windows Media Video 8"
- status working
- fourcc WMV2
- driver dshow
- dll "wmv8ds32.ax"
- guid 0x521fb373, 0x7654, 0x49f2, 0xbd, 0xb1, 0x0c, 0x6e, 0x66, 0x60, 0x71, 0x4f
- out YV12,I420,IYUV
- out YUY2,UYVY
- out BGR32,BGR24,BGR16,BGR15
-
-videocodec wmv7
- info "Windows Media Video 7"
- status working
- fourcc WMV1
- driver dshow
- dll "wmvds32.ax"
- guid 0x4facbba1, 0xffd8, 0x4cd7, 0x82, 0x28, 0x61, 0xe2, 0xf6, 0x5c, 0xb1, 0xae
- out YUY2,UYVY
- out BGR32,BGR24,BGR16,BGR15
-
-videocodec wmv9dmo
- info "Windows Media Video 9 DMO"
- status working
- fourcc WMV3
- driver dmo
- dll "wmv9dmod.dll"
- guid 0x724bb6a4, 0xe526, 0x450f, 0xaf, 0xfa, 0xab, 0x9b, 0x45, 0x12, 0x91, 0x11
- out YV12 ;,I420,IYUV
- out YUY2,UYVY
- out BGR32,BGR24,BGR16 ;,BGR15
-
-videocodec wmvdmo
- info "Windows Media Video DMO"
- status working
- fourcc WMV1
- fourcc WMV2
- fourcc WMV3
- driver dmo
- dll "wmvdmod.dll"
- guid 0x82d353df, 0x90bd, 0x4382, 0x8b, 0xc2, 0x3f, 0x61, 0x92, 0xb7, 0x6e, 0x34
- out YV12 ;,I420,IYUV
- out YUY2,UYVY
- out BGR32,BGR24,BGR16 ;,BGR15
-
-videocodec ubmp4
- info "UB Video MPEG 4"
- comment "black&white"
- status buggy
- fourcc mp4v UMP4 ; black&white, sometimes buggy too
- fourcc UMP4
- driver vfw
- dll "ubvmp4d.dll"
- out I420
- out UYVY
-
-
-; mjpegs:
-; Notes: m3jpeg+mjpeg are mmx optimized. avid is very stable but slow.
-; ijpg only decodes jpeg images (no mjpg), and slow.
-; Update: ffmjpeg is almost perfect (and optimized) now, prefer it to others.
-
-videocodec ffmjpeg
- info "FFmpeg MJPEG decoder"
- status working
- fourcc MJPG,mjpg
- fourcc AVRn,AVDJ ; AVID
- fourcc jpeg ; MOV photo-jpeg
- fourcc mjpa ; Apple MJPEG-A (Quicktime)
- fourcc JFIF ; SMJPEG (Loki)
- fourcc ijpg,IJPG ; -mf type=jpeg
- fourcc JPEG ; SGI's AVI Photo-jpeg
- driver ffmpeg
- dll mjpeg
- out 444P
- out 422P
- out YUY2 ; queryed (conversion from yuv422p)
- out YV12,I420,IYUV
-
-; slow. usable only for standalone jpegs, like -mf, avid or photojpeg:
-videocodec ijpg
- info "Independent JPEG Group's codec"
- status working
- fourcc ijpg,IJPG ; -mf type=jpeg
- fourcc jpeg ; MOV Photo Jpeg
- fourcc AVRn,AVDJ ; AVID
- driver ijpg
- dll libjpeg
- out RGB24,BGR24,BGR32
-
-; http://www.morgan-multimedia.com/dev/codec_spec.htm
-videocodec m3jpeg
- info "Morgan Motion JPEG Codec"
- status working
- fourcc MJPG
- fourcc mjpa,mjpb,mjpg MJPG ; MOV files
- fourcc dmb1 MJPG ; MJPEG by Matrox Rainbow Runner
- driver vfw
- dll "m3jpeg32.dll"
-; out YV12,I420
- out YUY2,UYVY
- out BGR32,BGR24,BGR15
-
-videocodec mjpeg
- info "MainConcept Motion JPEG"
- status working
- fourcc MJPG
- fourcc mjpa,mjpb,mjpg MJPG ; MOV files
-; fourcc AVRn,AVDJ MJPG ; AVID (sometimes buggy)
- driver vfw
- dll "mcmjpg32.dll"
- out YUY2,UYVY
- out BGR32,BGR24,BGR15
-
-videocodec avid
- info "AVID Motion JPEG"
- status working
- comment "slooooooooow but stable"
- fourcc AVRn
- fourcc AVDJ AVRn
- fourcc MJPG,mjpg AVRn
- driver vfw
- dll "AvidAVICodec.dll"
- out BGR24 flip
-
-videocodec LEAD
- info "LEAD (M)Jpeg"
- status working
- comment "supports interlaced MJPEG"
- fourcc MJPG
- fourcc jpeg MJPG ; MOV Photo Jpeg
- driver vfw
- dll "LCodcCMP.dll"
- out BGR24,BGR15
-
-videocodec imagepower
- info "ImagePower MJPEG2000"
- status buggy
- fourcc IPJ2
- driver vfw
- dll "jp2avi.dll"
- out BGR32,BGR24,BGR15
-
-videocodec m3jpeg2k
- info "Morgan MJPEG2000"
- status working
- fourcc MJ2C
- driver vfw
- dll "m3jp2k32.dll"
- out YV12,I420,IYUV
- out YUY2,UYVY
- out BGR32,BGR24,BGR15
-
-; http://www.morgan-multimedia.com/dev/directshow_dec_spec.htm
-videocodec m3jpegds
- info "Morgan MJPEG"
- status crashing
- fourcc MJPG mjpg
- fourcc mjpa,mjpb,mjpg mjpg ; MOV files
- fourcc dmb1 mjpg ; MJPEG by Matrox Rainbow Runner
- driver dshow
- dll "m3jpegdec.ax"
- guid 0x6988b440, 0x8352, 0x11d3, 0x9b, 0xda, 0xca, 0x86, 0x73, 0x7c, 0x71, 0x68
- out I420
- out YUY2,UYVY
- out BGR32,BGR24,BGR16,BGR15
-
-videocodec pegasusm
- info "Pegasus Motion JPEG"
- status crashing
- fourcc MJPG
- driver vfw
-; dll "pvmjpg20.dll" ; v2.0
- dll "pvmjpg21.dll" ; v2.1
- out BGR24 flip
-
-videocodec pegasusl
- info "Pegasus Lossless JPEG"
- status crashing
- fourcc JPGL
- fourcc MJPG JPGL
- driver vfw
- dll "pvljpg20.dll"
- out BGR24 flip
-
-videocodec pegasusmwv
- info "Pegasus Motion Wavelet 2000"
- status crashing
- fourcc PVW2
- driver vfw
- dll "pvwv220.dll"
- out BGR24 flip
-
; h263: - I don't know. comments?
-videocodec vivo
- info "Vivo H.263"
- status working
- fourcc VIVO,vivo vivo
- fourcc viv1,viv2 vivo
- driver vfw
- dll "ivvideo.dll"
- out BGR32,BGR24,BGR15 flip
- in BGR24
-
-videocodec u263
- info "UB Video H.263/H.263+/H.263++ Decoder"
- status working
- fourcc U263
- fourcc vivo,VIVO U263
- fourcc viv1 U263
- driver dshow
- dll "ubv263d+.ax"
- guid 0x00af1181, 0x6ebb, 0x11d4, 0x9d, 0x5a, 0x00, 0x50, 0x04, 0x79, 0x6c, 0xc0
-; out UYVY
-; BGR32,BGR16,BGR15 seems to work too
- out BGR24 flip
-
-videocodec i263
- info "I263"
- status working
- fourcc I263,i263,I420,i420
- fourcc vivo,VIVO I263
- fourcc viv1 I263
- driver vfw
- dll "i263_32.drv"
- out I420
- out YUY2
- out BGR32,BGR24,BGR15
-
videocodec ffi263
info "FFmpeg I263 decoder"
status working
@@ -681,488 +102,6 @@
dll h263
out YV12,I420,IYUV
-videocodec h263xa
- info "XAnim's CCITT H.263"
- status crashing
- fourcc H263,h263
- fourcc viv1 H263
- fourcc VIVO,vivo H263
- driver xanim
- dll "vid_h263.xa"
- out YV12,IYUV,I420
-
-videocodec h261xa
- info "XAnim's CCITT H.261"
- status untested
- fourcc H261,h261
- driver xanim
- dll "vid_h261.xa"
- out YV12,IYUV,I420
-
-videocodec m261
- info "M261"
- status untested
- fourcc m261,M261
- driver vfw
- dll "msh261.drv"
- out BGR32,BGR24,BGR15
-
-; indeo:
-; Note: indeo 3 is buggy, both xanim (bad decoding) and VfW (not work with DR)
-; Prefer win32 ones, they are faster, and 4/5 can DR. for fallback, there are
-; Xanim codecs, they provide YV12, useful for YUV display or encoding.
-
-videocodec indeo5ds
- info "Intel Indeo 5"
- status working
- fourcc IV50,iv50
- driver dshow
- dll "ir50_32.dll"
- guid 0x30355649, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71
- out YV12,IYUV,I420
- out YUY2,UYVY
- out BGR32,BGR24,BGR16,BGR15
-
-videocodec indeo5
- info "Intel Indeo 5"
- status working
- fourcc IV50,iv50
- driver vfwex
- dll "ir50_32.dll"
-; out YV12,I420 ; flickering
- out YUY2
- out BGR32,BGR24,BGR15
-
-videocodec indeo4
- info "Intel Indeo 4.1"
- status working
- fourcc IV41,iv41
- driver vfw
- dll "ir41_32.dll"
- out IF09
- out BGR24,BGR15
- in YVU9
-
-videocodec indeo3
- info "Intel Indeo 3.1/3.2"
- status working
- fourcc IV31,iv31
- fourcc IV32,iv32
- driver vfwex
- dll "ir32_32.dll"
- out IF09
- out BGR24,BGR15 flip,static
- in YVU9
-
-videocodec indeo5xa
- info "XAnim's Intel Indeo 5"
- status working
- fourcc IV50,iv50
- driver xanim
- dll "vid_iv50.xa"
- out YVU9
-
-videocodec indeo4xa
- info "XAnim's Intel Indeo 4.1"
- status working
- fourcc IV41,iv41
- driver xanim
- dll "vid_iv41.xa"
- out YVU9
-
-videocodec indeo3xa
- info "XAnim's Intel Indeo 3.1/3.2"
- status working
- fourcc IV31,iv31
- fourcc IV32,iv32
- driver xanim
- dll "vid_iv32.xa"
- out YVU9
-
-; DV: qdv is more stable... libdv is slow, mcdv is unstable
-
-videocodec qdv
- info "Sony Digital Video (DV)"
- status working
- fourcc dvsl,dvsd,dvhd ; ????
- fourcc DVSD dvsd ; pal .avi
- fourcc "dvcp" dvsd ; pal .mov
- fourcc "dvc " dvsd ; ntsc .mov
- driver dshow
- dll "qdv.dll"
- guid 0xB1B77C00, 0xC3E4, 0x11CF, 0xAF, 0x79, 0x00, 0xAA, 0x00, 0xB6, 0x7A, 0x42
- out YUY2
- out UYVY
- out BGR24,BGR16,BGR15 ; BGR32 is buggy, at least with one sample
-
-videocodec ffdv
- info "FFmpeg DV decoder"
- status working
- fourcc DVSD,dvsd ; PAL
- fourcc DVCS,dvcs ; NTSC ?
- fourcc "dvcp" ; PAL DV in .mov
- fourcc "dvc " ; NTSC DV in .mov
- driver ffmpeg
- dll dvvideo
- out 411P,YV12
-
-videocodec libdv
- info "Raw DV decoder (libdv)"
- status working
- fourcc DVSD,dvsd ; PAL
- fourcc DVCS,dvcs ; NTSC ?
- fourcc "dvcp" ; PAL DV in .mov
- fourcc "dvc " ; NTSC DV in .mov
- driver libdv
- dll libdv.so.2
- out YUY2
-
-; note: it crashes with pond.dv :(
-videocodec mcdv
- info "MainConcept DV Codec"
- status working
- fourcc DVSD,dvsd ; PAL
- fourcc DVCS,dvcs ; NTSC ?
- fourcc CDVC,cdvc ; ???
- fourcc "dvcp" dvsd ; PAL DV in .mov
- fourcc "dvc " dvcs ; NTSC DV in .mov
- driver vfw
- dll "mcdvd_32.dll"
- out YUY2
- out UYVY
- out BGR32,BGR24,BGR15
-
-; 3ivx:
-
-videocodec 3ivXxa
- info "XAnim's 3ivX Delta 3.5 plugin"
- status working
- fourcc 3IV1
- driver xanim
- dll "vid_3ivX.xa"
- out YV12,IYUV,I420
-
-videocodec 3ivX
- info "3ivX Delta 3.5"
- status crashing
- fourcc 3IV1
- driver dshow
- dll "3ivxdmo.dll"
- guid 0x0E6772C0, 0xDD80, 0x11D4, 0xB5, 0x8f, 0xA8, 0x6B, 0x66, 0xd0, 0x61, 0x1c
- out YV12
- out YUY2
- out BGR32,BGR24,BGR16,BGR15
-
-; experimental real video decoder using closed source codecs
-
-videocodec rv40
- info "Linux RealPlayer 9 RV40 decoder"
- status working
- fourcc RV40,rv40
- driver realvid
- dll "drv4.so.6.0"
- out I420
-
-videocodec rv40win
- info "Win32 RealPlayer 9 RV40 decoder"
- status working
- fourcc RV40,rv40
- driver realvid
- dll "drv43260.dll"
- out I420
-
-videocodec rv30
- info "Linux RealPlayer 8 RV30 decoder"
- status working
- fourcc RV30,rv30
- driver realvid
- dll "drv3.so.6.0"
- out I420
-
-videocodec rv30win
- info "Win32 RealPlayer 8 RV30 decoder"
- status working
- fourcc RV30,rv30
- driver realvid
- dll "drv33260.dll"
- out I420
-
-videocodec rv20
- info "Linux RealPlayer 8 RV20 decoder"
- status working
- fourcc RV20,rv20
- driver realvid
- dll "drv2.so.6.0"
- out I420
-
-videocodec rv20win
- info "Win32 RealPlayer 8 RV20 decoder"
- status working
- fourcc RV20,rv20
- driver realvid
- dll "drv23260.dll"
- out I420
-
-; others:
-
-videocodec ffrv10
- info "FFmpeg RV10 decoder"
- status working
- fourcc RV10,rv10
- fourcc RV13,rv13
- driver ffmpeg
- dll rv10
- out YV12,I420,IYUV
-
-videocodec vp3
- info "On2 OpenSource VP3-Codec"
- status working
- comment "For SSE-systems use fixed dll from ftp://mplayerhq.hu/MPlayer/samples/drivers32/"
- fourcc VP30,vp30,VP31,vp31
- flags align16
- driver vfwex
- dll "vp31vfw.dll"
- out YUY2
- out BGR32,BGR24,BGR15
-
-videocodec mwv1
- info "Motion Wavelets"
- status working
- fourcc MWV1
- driver vfw
- dll "icmw_32.dll"
- out BGR24,BGR15 flip
-
-videocodec asv2
- info "ASUS V2"
- status working
- fourcc ASV2
- driver vfw
- dll "asusasv2.dll"
- out UYVY
- out BGR32,BGR24,BGR15 flip
-
-videocodec asv1
- info "ASUS V1"
- status working
- fourcc ASV1
- driver vfw
- dll "asusasvd.dll"
- out UYVY
- out BGR32,BGR24,BGR15 flip
-
-videocodec mss1
- info "Windows Screen Video"
- status working
- fourcc MSS1
- driver dshow
- dll "msscds32.ax"
- guid 0x3301a7c4, 0x0a8d, 0x11d4, 0x91, 0x4d, 0x00, 0xc0, 0x4f, 0x61, 0x0d, 0x24
- out BGR32,BGR24,BGR16,BGR15
-
-; CLRVIDDC.DLL needed too, with uppercase
-videocodec ucod
- info "UCOD-ClearVideo"
- status working
- fourcc UCOD
- driver vfw
- dll "clrviddd.dll"
- out BGR32,BGR24,BGR15 flip
-
-videocodec vcr2
- info "ATI VCR-2"
- status working
- fourcc VCR2
- driver vfw
- dll "ativcr2.dll"
- out YV12
- out BGR24
-
-videocodec CJPG
- info "CJPG"
- status untested
- comment "need sample files (this dll is decompression only!)"
- fourcc CJPG
- driver vfw
- dll "CtWbJpg.DLL"
- out YUY2
- out UYVY
- out BGR24,BGR15
-
-; our BGR15->BGR32 is bad or the DLL?
-videocodec tm20
- info "TrueMotion 2.0"
- status working
- comment "YUV faulting"
- fourcc TM20
- driver dshow
- dll "tm20dec.ax"
- guid 0x4cb63e61, 0xc611, 0x11D0, 0x83, 0xaa, 0x00, 0x00, 0x92, 0x90, 0x01, 0x84
- out BGR32,BGR24,BGR16
-
-videocodec sp5x
- info "SP5x codec - used by Aiptek MegaCam"
- status working
- fourcc SP53,SP54,SP55,SP56,SP57,SP58
- driver vfw
- dll "sp5x_32.dll"
- out BGR24,BGR15
-
-; quicktime codecs:
-
-videocodec qt3ivx
- info "win32/quicktime 3IV1 (3ivx) decoder"
- status working
- fourcc 3IV1
- driver qtvideo
- dll "3ivx Delta 3.5.qtx"
- out YUY2
-
-videocodec qth263
- info "win32/quicktime H.263 decoder"
- status crashing
- fourcc h263
- driver qtvideo
- dll "QuickTime.qts"
- out YUY2
-
-videocodec qtrlerpza
- info "win32/quicktime RLE/RPZA decoder"
- comment "no colorspace accepted"
- status crashing
- fourcc rpza
- format 0x20656C72 ; "rle "
- driver qtvideo
- dll "QuickTime.qts"
- out BGR32,BGR24,BGR15
-
-videocodec qtvp3
- info "win32/quicktime VP3 decoder"
- status crashing
- fourcc VP31
- driver qtvideo
- dll "On2_VP3.qtx"
- out YUY2
-
-videocodec qtzygo
- info "win32/quicktime ZyGo decoder"
- status buggy
- comment "wrong colors"
- fourcc ZyGo,zygo,lsvx
- driver qtvideo
- dll "ZyGoVideo.qtx"
- out BGR32,RGB32
-
-videocodec qtbhiv
- info "win32/quicktime BeHereiVideo decoder"
- comment "sample file wanted!"
- status untested
- fourcc bhiv
- driver qtvideo
- dll "BeHereiVideo.qtx"
- out YUY2
-
-videocodec qtsvq3
- info "win32/quicktime SVQ3 decoder"
- status working
- fourcc SVQ3
- driver qtvideo
- dll "QuickTimeEssentials.qtx"
- out YUY2
-
-videocodec qtsvq1
- info "win32/quicktime SVQ1 decoder"
- status buggy
- fourcc SVQ1
- driver qtvideo
- dll "QuickTime.qts"
- out YVU9
-
-; buggy codecs: (any volunteers for native rewrite?)
-
-videocodec zlib
- info "AVIzlib"
- status working
- comment "24bpp only"
- fourcc ZLIB
- driver vfw
- dll "avizlib.dll"
- out BGR24 flip
-
-videocodec mszh
- info "AVImszh"
- status working
- comment "24bpp only"
- fourcc MSZH
- driver vfw
- dll "avimszh.dll"
-; out YUY2
-; out BGR32,BGR24,BGR15
- out BGR24
-
-videocodec alaris
- info "Alaris VideoGramPiX"
-; http://www.alaris.com/movies/toocool.vgm
-; Martin Schuster <schuster@ap.univie.ac.at>
- status crashing
- comment "only produces strange patterns"
- fourcc VGPX,VTLP VGPX
- driver vfwex
- dll "vgpix32d.dll"
- out UYVY
- out BGR24
-
-
-; non-working codecs:
-
-videocodec vcr1
- info "ATI VCR-1"
- status crashing
- fourcc VCR1
- driver vfw
- dll "ativcr1.dll"
- out RGB24 flip
-
-videocodec pim1
- info "Pinnacle Hardware MPEG1"
- status crashing
- comment "no picture. use ffmpeg12!"
- fourcc PIM1
- driver vfw
- dll "pclepim1.dll"
- out BGR24 flip
-; out I420
-; out YUY2
-; out BGR32,BGR24,BGR16,BGR15
-
-videocodec qpeg
- info "Q-Team's QPEG (www.q-team.de)"
- status working
- comment "BGR8 only!"
- fourcc Q1.0,QPEG
- fourcc Q1.1,qpeq
- driver vfw
- dll "qpeg32.dll"
- out BGR8 flip
-
-videocodec rricm
- info "rricm"
- status crashing
- fourcc dmb1
- driver vfw
- dll "rricm.dll"
- out YUY2
- out BGR24 flip
-
-; sample videos: http://www.techsmith.com/products/camtasia/examplevideos.asp
-videocodec camtasia
- info "TechSmith Camtasia Screen Codec"
- status working
- fourcc TSCC,tscc
- driver vfw
- dll "tsccvid.dll"
- out BGR15 flip
-
; raw formats: (now RGB formats are autodetected)
; these raw codecs are used mostly by tv input
@@ -1314,73 +253,17 @@
; AUDIO CODECS
;=============================================================================
-audiocodec wma9dmo
- info "Windows Media Audio 9 DMO"
- status working
- format 0x162
- driver dmo
- dll "wma9dmod.dll"
- guid 0x27ca0808, 0x01f5, 0x4e7a, 0x8b, 0x05, 0x87, 0xf8, 0x07, 0xa2, 0x33, 0xd1
-
-audiocodec wmadmo
- info "Windows Media Audio DMO"
- status working
- format 0x160
- format 0x161
- format 0x162
- driver dmo
- dll "wmadmod.dll"
- guid 0x2eeb4adf, 0x4578, 0x4d10, 0xbc, 0xa7, 0xbb, 0x95, 0x5f, 0x56, 0x32, 0x0a
-
-audiocodec qdmc
- info "Quicktime QDMC/QDM2 audio decoders"
- status working
- format 0x324D4451 ; "QDM2"
- format 0x434D4451 ; "QDMC"
- driver qtaudio
- dll "QuickTime.qts"
-
-audiocodec qclp
- info "Quicktime QCLP audio decoder"
- status working
- format 0x706C6351 ; "QCLP"
- driver qtaudio
- dll "QuickTime.qts"
-
-audiocodec qtmace3
- info "Quicktime MACE3 audio decoder"
- status working
- format 0x3343414D ; "MAC3"
- driver qtaudio
- dll "QuickTime.qts"
-
-audiocodec qtmace6
- info "Quicktime MACE6 audio decoder"
- status working
- format 0x3643414D ; "MAC6"
- driver qtaudio
- dll "QuickTime.qts"
-
-audiocodec racook
- info "RealAudio COOK"
- status working
- format 0x6B6F6F63 ; "cook"
- driver realaud
- dll "cook.so.6.0"
-
-audiocodec rasipr
- info "RealAudio Sipro"
- status working
- format 0x72706973 ; "sipr"
- driver realaud
- dll "sipr.so.6.0"
-
-audiocodec raatrc
- info "RealAudio ATRAC3"
+;MAD library
+audiocodec mad
+ info "libMAD MPEG layer 1-2-3"
status working
- format 0x63727461 ; "atrc"
- driver realaud
- dll "atrc.so.6.0"
+ format 0x50
+ format 0x55
+ format 0x33706d2e ; ".mp3" CBR/VBR MP3 (MOV files)
+ format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
+ driver libmad
+ dll "libmad"
+ flags seekable
audiocodec imaadpcm
info "IMA ADPCM"
@@ -1397,41 +280,6 @@
format 0x0200736d ; "ms\x00\x02" (MOV files)
driver msadpcm
-audiocodec dk4adpcm
- info "Duck DK4 ADPCM (rogue format number)"
- status working
- comment "This format number was used by Duck Corp. but not officially registered with Microsoft"
- format 0x61
- driver imaadpcm
-
-audiocodec dk3adpcm
- info "Duck DK3 ADPCM (rogue format number)"
- status working
- comment "This format number was used by Duck Corp. but not officially registered with Microsoft"
- format 0x62
- driver dk3adpcm
-
-audiocodec roqaudio
- info "Id RoQ File Audio Decoder"
- status working
- comment "RoQA is an internal MPlayer FOURCC"
- fourcc RoQA
- driver roqaudio
-
-audiocodec libdv
- info "raw DV audio decoder (libdv)"
- status working
- fourcc RADV
- driver libdv
- dll libdv.so.2
-
-audiocodec faad
- info "AAC MPEG2/MPEG4 Audio"
- status working
- fourcc mp4a,MP4A
- driver faad
- dll libfaad2
-
audiocodec pcm
info "Uncompressed PCM"
status working
@@ -1448,133 +296,6 @@
;;;;
driver pcm
-audiocodec divx
- info "DivX audio (WMA)"
- status working
- format 0x160
- format 0x161
- driver acm
- dll "divxa32.acm"
-
-audiocodec msadpcmacm
- info "MS ADPCM"
- status working
- format 0x2
- driver acm
- dll "msadp32.acm"
-
-audiocodec mp3
- info "mp3lib MPEG layer-2, layer-3"
- status working
- comment "Optimized to MMX/SSE/3Dnow!"
- format 0x50 ; layer-1 && layer-2
- format 0x55 ; layer-3
- format 0x33706d2e ; ".mp3" CBR/VBR MP3 (MOV files)
- format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
- driver mp3lib
- flags seekable
-
-audiocodec ffwmav1
- info "DivX audio v1 (ffmpeg)"
- status untested
- format 0x160
- driver ffmpeg
- dll "wmav1"
-
-audiocodec ffwmav2
- info "DivX audio v2 (ffmpeg)"
- status untested
- format 0x161
- driver ffmpeg
- dll "wmav2"
-
-audiocodec ffmac3
- info "Macintosh Audio Compression and Expansion 3:1"
- status untested
- fourcc "MAC3"
- driver ffmpeg
- dll "mace3"
-
-audiocodec ffmac6
- info "Macintosh Audio Compression and Expansion 6:1"
- status untested
- fourcc "MAC6"
- driver ffmpeg
- dll "mace6"
-
-audiocodec ffmp3
- info "FFmpeg layer-3 audio decoder"
- comment "integer only"
- status working
- format 0x55
- format 0x33706d2e ; ".mp3" CBR/VBR MP3 (MOV files)
- format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
- driver ffmpeg
- dll "mp3"
- flags seekable
-
-audiocodec ffmp2
- info "FFmpeg layer 1,2 audio decoder"
- comment "integer only"
- status working
- format 0x50
- driver ffmpeg
- dll "mp2"
- flags seekable
-
-;MAD library
-audiocodec mad
- info "libMAD MPEG layer 1-2-3"
- status working
- format 0x50
- format 0x55
- format 0x33706d2e ; ".mp3" CBR/VBR MP3 (MOV files)
- format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
- driver libmad
- dll "libmad"
- flags seekable
-
-
-audiocodec mp3acm
- info "MPEG layer-3"
- status working
- comment "conflicts with security kernel patches"
- format 0x55
- driver acm
- dll "l3codeca.acm"
- flags seekable
-
-audiocodec imaadpcmacm
- info "IMA ADPCM"
- status working
- format 0x11
- driver acm
- dll "imaadp32.acm"
-
-audiocodec msgsmacm
- info "MS GSM"
- status working
- format 0x31
-; format 0x32
- driver acm
- dll "msgsm32.acm"
-
-audiocodec msnaudio
- info "MSN AUDIO"
- status working
-; format 0x31
- format 0x32
- driver acm
- dll "msnaudio.acm"
-
-audiocodec msgsm
- info "MS GSM"
- status working
- format 0x31
- format 0x32
- fourcc agsm
- driver msgsm
-
audiocodec alaw
info "aLaw"
status working
@@ -1601,113 +322,3 @@
format 0x2000
driver liba52
dll "liba52"
-
-audiocodec ac3
- info "AC3-libac3"
- comment "removed from mplayer, use liba52"
- status working
- format 0x2000
- driver libac3
- dll "libac3"
-
-audiocodec voxware
- info "VoxWare"
- status working
- format 0x75
- driver dshow
- dll "voxmsdec.ax"
- guid 0x73f7a062, 0x8829, 0x11d1, 0xb5, 0x50, 0x00, 0x60, 0x97, 0x24, 0x2d, 0x8d
-
-audiocodec acelp
- info "ACELP.net Sipro Lab Audio Decoder"
- status working
- format 0x130
- driver dshow
- dll "acelpdec.ax"
- guid 0x4009f700, 0xaeba, 0x11d1, 0x83, 0x44, 0x00, 0xc0, 0x4f, 0xb9, 0x2e, 0xb7
-
-audiocodec imc
- info "Intel Music Coder"
- status working
- comment "driver at http://codeczone.virtualave.net/FXIMCAUD.zip"
- format 0x401
- driver acm
- dll "imc32.acm"
-
-audiocodec hwac3
- info "AC3 through SPDIF"
- status working
- format 0x2000
- driver hwac3
-
-audiocodec vorbis
- info "OggVorbis Audio Decoder"
- status working
- comment "OggVorbis driver using libvorbis"
- format 0xFFFE
- driver libvorbis
- dll "libvorbis"
- flags seekable
-; acm codec doesn't work, haven't tried zorannt dshow codec
-; driver acm
-; dll "vorbis.acm"
-
-audiocodec vivoaudio
- info "Vivo G.723/Siren Audio Codec"
- status working
- format 0x111 ; vivo g.723
- format 0x112 ; siren
- driver acm
- dll "vivog723.acm"
-
-audiocodec g72x
- info "G.711/G.721/G.723"
- status crashing
- comment "does not work yet - just noise :("
- format 0x111 ; vivo g.723
- format 0x112 ; vivo siren
- driver g72x
- dll "g72x.c"
-
-audiocodec atrac3
- info "Sony ATRAC3"
- status buggy
- comment "format not accepted"
- format 0x270
- driver acm
- dll "atrac3.acm"
-
-audiocodec ALF2
-; http://www.nctsoft.com/products/NCTALFCD/
-; jdp@mail.sonofon.dk
- info "ALF2"
- status working
- format 0x1FC4 ; ALF2
- driver acm
- dll "alf2cd.acm"
-
-audiocodec truespeech
- info "DSP Group TrueSpeech(TM)"
- status working
- format 0x22
- driver acm
- dll "tssoft32.acm"
-
-; rt32dcmp.dll needed too
-audiocodec voxwarert24
- info "VoxWare RT24 speech codec"
- status working
- format 0x181c
- driver acm
- dll "nsrt2432.acm"
-
-audiocodec lhacm
- info "Lernout & Hauspie CELP and SBC codecs"
- status working
- format 0x1101 ; CELP
- format 0x1102 ; SBC
- format 0x1103 ; SBC
- format 0x1104 ; SBC
- driver acm
- dll "lhacm.acm"
-
diff -aur MPlayer-0.90rc2.orig/etc/.libdeps MPlayer-0.90rc2/etc/.libdeps
--- MPlayer-0.90rc2.orig/etc/.libdeps 2002-10-07 22:23:04.000000000 +0800
+++ MPlayer-0.90rc2/etc/.libdeps 2008-09-06 21:57:20.000000000 +0800
@@ -17,7 +17,6 @@
libvo/libvo.a: $(wildcard libvo/*.[ch])
libao2/libao2.a: $(wildcard libao2/*.[ch])
liba52/liba52.a: $(wildcard liba52/*.[ch])
-mp3lib/libMP3.a: $(wildcard mp3lib/*.[ch])
libdha/libdha.so: $(wildcard libdha/*.[ch])
vidix/libvidix.a: $(wildcard vidix/*.[ch])
Gui/libgui.a: $(wildcard Gui/*.[ch])
diff -aur MPlayer-0.90rc2.orig/help/help_mp-en.h MPlayer-0.90rc2/help/help_mp-en.h
--- MPlayer-0.90rc2.orig/help/help_mp-en.h 2002-12-16 07:45:37.000000000 +0800
+++ MPlayer-0.90rc2/help/help_mp-en.h 2008-09-06 21:59:21.000000000 +0800
@@ -31,26 +31,12 @@
" -nosound don't play sound\n"
" -fs -vm -zoom fullscreen playing options (fullscr,vidmode chg,softw.scale)\n"
" -x <x> -y <y> set display resolution (for use with -vm or -zoom)\n"
-" -sub <file> specify subtitle file to use (see also -subfps, -subdelay)\n"
" -playlist <file> specify playlist file\n"
" -vid x -aid y options to select video (x) and audio (y) stream to play\n"
" -fps x -srate y options to change video (x fps) and audio (y Hz) rate\n"
" -pp <quality> enable postprocessing filter (see the man page for details)\n"
" -framedrop enable frame dropping (for slow machines)\n"
"\n"
-"Basic keys: (see the man page for the complete list, also check input.conf)\n"
-" <- or -> seek backward/forward 10 seconds\n"
-" up or down seek backward/forward 1 minute\n"
-" pgup or pgdown seek backward/forward 10 minutes\n"
-" < or > step backward/forward in playlist\n"
-" p or SPACE pause movie (press any key to continue)\n"
-" q or ESC stop playing and quit program\n"
-" + or - adjust audio delay by +/- 0.1 second\n"
-" o cycle OSD mode: none / seekbar / seekbar+timer\n"
-" * or / increase or decrease pcm volume\n"
-" z or x adjust subtitle delay by +/- 0.1 second\n"
-" r or t adjust subtitle position up/down, also see -vop expand\n"
-"\n"
" * * * SEE MAN PAGE FOR DETAILS, FURTHER (ADVANCED) OPTIONS AND KEYS! * * *\n"
"\n";
#endif
@@ -97,9 +83,6 @@
" **** Your system is too SLOW to play this! ****\n"\
" ************************************************\n"\
"!!! Possible reasons, problems, workarounds: \n"\
-"- Most common: broken/buggy _audio_ driver. Workaround: Try -ao sdl or use\n"\
-" ALSA 0.5 or OSS emulation of ALSA 0.9. Read DOCS/sound.html for more tips!\n"\
-" You can also experiment with -autosync 30 or other values.\n"\
"- Slow video output. Try a different -vo driver (for list: -vo help) or try\n"\
" with -framedrop! Read DOCS/video.html for video tuning/speedup tips.\n"\
"- Slow CPU. Don't try to play a big DVD/divx on a slow CPU! Try -hardframedrop.\n"\
diff -aur MPlayer-0.90rc2.orig/libaf/af.c MPlayer-0.90rc2/libaf/af.c
--- MPlayer-0.90rc2.orig/libaf/af.c 2002-11-12 20:33:54.000000000 +0800
+++ MPlayer-0.90rc2/libaf/af.c 2008-09-06 21:57:20.000000000 +0800
@@ -15,7 +15,6 @@
extern af_info_t af_info_format;
extern af_info_t af_info_resample;
extern af_info_t af_info_volume;
-extern af_info_t af_info_equalizer;
static af_info_t* filter_list[]={ \
&af_info_dummy,\
@@ -24,7 +23,6 @@
&af_info_format,\
&af_info_resample,\
&af_info_volume,\
- &af_info_equalizer,\
NULL \
};
diff -aur MPlayer-0.90rc2.orig/libaf/Makefile MPlayer-0.90rc2/libaf/Makefile
--- MPlayer-0.90rc2.orig/libaf/Makefile 2002-11-25 10:19:27.000000000 +0800
+++ MPlayer-0.90rc2/libaf/Makefile 2008-09-06 21:57:20.000000000 +0800
@@ -2,7 +2,7 @@
LIBNAME = libaf.a
-SRCS=af.c af_mp.c af_dummy.c af_delay.c af_channels.c af_format.c af_resample.c window.c filter.c af_volume.c af_equalizer.c
+SRCS=af.c af_mp.c af_dummy.c af_delay.c af_channels.c af_format.c af_resample.c window.c filter.c af_volume.c
OBJS=$(SRCS:.c=.o)
diff -aur MPlayer-0.90rc2.orig/libao2/audio_out.c MPlayer-0.90rc2/libao2/audio_out.c
--- MPlayer-0.90rc2.orig/libao2/audio_out.c 2002-12-23 00:31:02.000000000 +0800
+++ MPlayer-0.90rc2/libao2/audio_out.c 2008-09-06 21:57:20.000000000 +0800
@@ -44,15 +44,12 @@
#ifdef HAVE_DXR2
extern ao_functions_t audio_out_dxr2;
#endif
-extern ao_functions_t audio_out_mpegpes;
extern ao_functions_t audio_out_pcm;
extern ao_functions_t audio_out_pss;
extern ao_functions_t audio_out_plugin;
ao_functions_t* audio_out_drivers[] =
{
-// vo-related: will fail unless you also do -vo mpegpes/dxr2
- &audio_out_mpegpes,
#ifdef HAVE_DXR2
&audio_out_dxr2,
#endif
diff -aur MPlayer-0.90rc2.orig/libao2/audio_plugin.h MPlayer-0.90rc2/libao2/audio_plugin.h
--- MPlayer-0.90rc2.orig/libao2/audio_plugin.h 2002-07-26 04:28:47.000000000 +0800
+++ MPlayer-0.90rc2/libao2/audio_plugin.h 2008-09-06 21:57:20.000000000 +0800
@@ -60,22 +60,14 @@
// List of plugins
extern ao_plugin_functions_t audio_plugin_delay;
extern ao_plugin_functions_t audio_plugin_format;
-extern ao_plugin_functions_t audio_plugin_surround;
extern ao_plugin_functions_t audio_plugin_resample;
extern ao_plugin_functions_t audio_plugin_volume;
-extern ao_plugin_functions_t audio_plugin_extrastereo;
-extern ao_plugin_functions_t audio_plugin_volnorm;
-extern ao_plugin_functions_t audio_plugin_eq;
#define AO_PLUGINS { \
&audio_plugin_delay, \
&audio_plugin_format, \
- &audio_plugin_surround, \
&audio_plugin_resample, \
&audio_plugin_volume, \
- &audio_plugin_extrastereo, \
- &audio_plugin_volnorm, \
- &audio_plugin_eq, \
NULL \
}
#endif /* PLUGIN */
diff -aur MPlayer-0.90rc2.orig/libao2/Makefile MPlayer-0.90rc2/libao2/Makefile
--- MPlayer-0.90rc2.orig/libao2/Makefile 2002-06-15 14:15:07.000000000 +0800
+++ MPlayer-0.90rc2/libao2/Makefile 2008-09-06 21:57:20.000000000 +0800
@@ -4,7 +4,7 @@
LIBNAME = libao2.a
# TODO: moveout ao_sdl.c so it's only used when SDL is detected
-SRCS=afmt.c audio_out.c ao_mpegpes.c ao_null.c ao_pcm.c ao_plugin.c pl_delay.c pl_format.c pl_surround.c remez.c pl_resample.c pl_volume.c pl_extrastereo.c pl_volnorm.c pl_eq.c $(OPTIONAL_SRCS)
+SRCS=afmt.c audio_out.c ao_null.c ao_pcm.c ao_plugin.c pl_delay.c pl_format.c pl_resample.c pl_volume.c $(OPTIONAL_SRCS)
OBJS=$(SRCS:.c=.o)
diff -aur MPlayer-0.90rc2.orig/libavcodec/allcodecs.c MPlayer-0.90rc2/libavcodec/allcodecs.c
--- MPlayer-0.90rc2.orig/libavcodec/allcodecs.c 2002-12-25 02:44:59.000000000 +0800
+++ MPlayer-0.90rc2/libavcodec/allcodecs.c 2008-09-06 21:57:20.000000000 +0800
@@ -35,7 +35,6 @@
/* encoders */
#ifdef CONFIG_ENCODERS
register_avcodec(&ac3_encoder);
- register_avcodec(&mp2_encoder);
#ifdef CONFIG_MP3LAME
register_avcodec(&mp3lame_encoder);
#endif
@@ -46,15 +45,12 @@
register_avcodec(&mpeg1video_encoder);
register_avcodec(&h263_encoder);
register_avcodec(&h263p_encoder);
- register_avcodec(&rv10_encoder);
- register_avcodec(&mjpeg_encoder);
register_avcodec(&mpeg4_encoder);
register_avcodec(&msmpeg4v1_encoder);
register_avcodec(&msmpeg4v2_encoder);
register_avcodec(&msmpeg4v3_encoder);
register_avcodec(&wmv1_encoder);
// register_avcodec(&wmv2_encoder);
- register_avcodec(&huffyuv_encoder);
#endif /* CONFIG_ENCODERS */
register_avcodec(&rawvideo_codec);
@@ -69,19 +65,6 @@
// register_avcodec(&wmv2_decoder);
register_avcodec(&mpeg_decoder);
register_avcodec(&h263i_decoder);
- register_avcodec(&rv10_decoder);
- register_avcodec(&svq1_decoder);
- register_avcodec(&dvvideo_decoder);
- // register_avcodec(&dvaudio_decoder);
- register_avcodec(&mjpeg_decoder);
- register_avcodec(&mjpegb_decoder);
- register_avcodec(&mp2_decoder);
- register_avcodec(&mp3_decoder);
- register_avcodec(&wmav1_decoder);
- register_avcodec(&wmav2_decoder);
- register_avcodec(&mace3_decoder);
- register_avcodec(&mace6_decoder);
- register_avcodec(&huffyuv_decoder);
#ifdef CONFIG_AC3
register_avcodec(&ac3_decoder);
#endif
diff -aur MPlayer-0.90rc2.orig/libavcodec/avcodec.c MPlayer-0.90rc2/libavcodec/avcodec.c
--- MPlayer-0.90rc2.orig/libavcodec/avcodec.c 2002-12-08 06:56:12.000000000 +0800
+++ MPlayer-0.90rc2/libavcodec/avcodec.c 2008-09-06 21:57:20.000000000 +0800
@@ -30,7 +30,6 @@
{ CODEC_ID_MSMPEG4V3, { MKTAG('D', 'I', 'V', '3'), 0 } },
{ CODEC_ID_MPEG4, { MKTAG('D', 'I', 'V', 'X'), MKTAG('D', 'X', '5', '0'), 0 } },
{ CODEC_ID_MSMPEG4V2, { MKTAG('M', 'P', '4', '2'), 0 } },
- { CODEC_ID_MJPEG, { MKTAG('M', 'J', 'P', 'G'), 0 } },
{ CODEC_ID_MPEG1VIDEO, { MKTAG('P', 'I', 'M', '1'), 0 } },
{ CODEC_ID_AC3, { 0x2000, 0 } },
{ CODEC_ID_MP2, { 0x50, 0x55, 0 } },
diff -aur MPlayer-0.90rc2.orig/libavcodec/avcodec.h MPlayer-0.90rc2/libavcodec/avcodec.h
--- MPlayer-0.90rc2.orig/libavcodec/avcodec.h 2002-12-25 02:44:59.000000000 +0800
+++ MPlayer-0.90rc2/libavcodec/avcodec.h 2008-09-06 21:57:20.000000000 +0800
@@ -12,13 +12,9 @@
CODEC_ID_NONE,
CODEC_ID_MPEG1VIDEO,
CODEC_ID_H263,
- CODEC_ID_RV10,
- CODEC_ID_MP2,
CODEC_ID_MP3LAME,
CODEC_ID_VORBIS,
CODEC_ID_AC3,
- CODEC_ID_MJPEG,
- CODEC_ID_MJPEGB,
CODEC_ID_MPEG4,
CODEC_ID_RAWVIDEO,
CODEC_ID_MSMPEG4V1,
@@ -28,14 +24,6 @@
CODEC_ID_WMV2,
CODEC_ID_H263P,
CODEC_ID_H263I,
- CODEC_ID_SVQ1,
- CODEC_ID_DVVIDEO,
- CODEC_ID_DVAUDIO,
- CODEC_ID_WMAV1,
- CODEC_ID_WMAV2,
- CODEC_ID_MACE3,
- CODEC_ID_MACE6,
- CODEC_ID_HUFFYUV,
/* various pcm "codecs" */
CODEC_ID_PCM_S16LE,
@@ -322,8 +310,6 @@
/**
* some codecs need / can use extra-data like huffman tables
- * mjpeg: huffman tables
- * rv10: additional flags
* mpeg4: global headers (they can be in the bitstream or here)
* encoding: set/allocated/freed by lavc.
* decoding: set/allocated/freed by user.
@@ -785,14 +771,14 @@
unsigned dsp_mask;
/**
- * bits per sample/pixel from the demuxer (needed for huffyuv)
+ * bits per sample/pixel from the demuxer
* encoding: set by lavc
* decoding: set by user
*/
int bits_per_sample;
/**
- * prediction method (needed for huffyuv)
+ * prediction method
* encoding: set by user
* decoding: unused
*/
@@ -876,21 +862,17 @@
} AVPicture;
extern AVCodec ac3_encoder;
-extern AVCodec mp2_encoder;
extern AVCodec mp3lame_encoder;
extern AVCodec oggvorbis_encoder;
extern AVCodec mpeg1video_encoder;
extern AVCodec h263_encoder;
extern AVCodec h263p_encoder;
-extern AVCodec rv10_encoder;
-extern AVCodec mjpeg_encoder;
extern AVCodec mpeg4_encoder;
extern AVCodec msmpeg4v1_encoder;
extern AVCodec msmpeg4v2_encoder;
extern AVCodec msmpeg4v3_encoder;
extern AVCodec wmv1_encoder;
extern AVCodec wmv2_encoder;
-extern AVCodec huffyuv_encoder;
extern AVCodec h263_decoder;
extern AVCodec mpeg4_decoder;
@@ -901,19 +883,6 @@
extern AVCodec wmv2_decoder;
extern AVCodec mpeg_decoder;
extern AVCodec h263i_decoder;
-extern AVCodec rv10_decoder;
-extern AVCodec svq1_decoder;
-extern AVCodec dvvideo_decoder;
-extern AVCodec dvaudio_decoder;
-extern AVCodec wmav1_decoder;
-extern AVCodec wmav2_decoder;
-extern AVCodec mjpeg_decoder;
-extern AVCodec mjpegb_decoder;
-extern AVCodec mp2_decoder;
-extern AVCodec mp3_decoder;
-extern AVCodec mace3_decoder;
-extern AVCodec mace6_decoder;
-extern AVCodec huffyuv_decoder;
extern AVCodec oggvorbis_decoder;
/* pcm codecs */
diff -aur MPlayer-0.90rc2.orig/libavcodec/dsputil.h MPlayer-0.90rc2/libavcodec/dsputil.h
--- MPlayer-0.90rc2.orig/libavcodec/dsputil.h 2002-12-08 06:56:13.000000000 +0800
+++ MPlayer-0.90rc2/libavcodec/dsputil.h 2008-09-06 21:57:20.000000000 +0800
@@ -119,7 +119,6 @@
op_pixels_abs_func pix_abs8x8_y2;
op_pixels_abs_func pix_abs8x8_xy2;
- /* huffyuv specific */
//FIXME note: alignment isnt guranteed currently but could be if needed
void (*add_bytes)(uint8_t *dst/*align 16*/, uint8_t *src/*align 16*/, int w);
void (*diff_bytes)(uint8_t *dst/*align 16*/, uint8_t *src1/*align 16*/, uint8_t *src2/*align 16*/,int w);
diff -aur MPlayer-0.90rc2.orig/libavcodec/h263.c MPlayer-0.90rc2/libavcodec/h263.c
--- MPlayer-0.90rc2.orig/libavcodec/h263.c 2002-12-25 02:44:59.000000000 +0800
+++ MPlayer-0.90rc2/libavcodec/h263.c 2008-09-06 21:57:20.000000000 +0800
@@ -3402,25 +3402,9 @@
}
} else if (s->mb_intra) {
/* DC coef */
- if (s->h263_rv10 && s->rv10_version == 3 && s->pict_type == I_TYPE) {
- int component, diff;
- component = (n <= 3 ? 0 : n - 4 + 1);
- level = s->last_dc[component];
- if (s->rv10_first_dc_coded[component]) {
- diff = rv_decode_dc(s, n);
- if (diff == 0xffff)
- return -1;
- level += diff;
- level = level & 0xff; /* handle wrap round */
- s->last_dc[component] = level;
- } else {
- s->rv10_first_dc_coded[component] = 1;
- }
- } else {
- level = get_bits(&s->gb, 8);
- if (level == 255)
- level = 128;
- }
+ level = get_bits(&s->gb, 8);
+ if (level == 255)
+ level = 128;
block[0] = level;
i = 1;
} else {
@@ -3444,11 +3428,6 @@
last = get_bits1(&s->gb);
run = get_bits(&s->gb, 6);
level = (INT8)get_bits(&s->gb, 8);
- if (s->h263_rv10 && level == -128) {
- /* XXX: should patch encoder too */
- level = get_bits(&s->gb, 12);
- level= (level + ((-1)<<11)) ^ ((-1)<<11); //sign extension
- }
} else {
run = rl->table_run[code];
level = rl->table_level[code];
diff -aur MPlayer-0.90rc2.orig/libavcodec/Makefile MPlayer-0.90rc2/libavcodec/Makefile
--- MPlayer-0.90rc2.orig/libavcodec/Makefile 2002-12-08 06:56:12.000000000 +0800
+++ MPlayer-0.90rc2/libavcodec/Makefile 2008-09-06 21:57:20.000000000 +0800
@@ -7,16 +7,16 @@
VPATH=$(SRC_PATH)/libavcodec
# NOTE: -I.. is needed to include config.h
-CFLAGS= $(OPTFLAGS) -Wall -g -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+CFLAGS= $(OPTFLAGS) -Wall -g -DHAVE_AV_CONFIG_H -I.. -D_GNU_SOURCE
LDFLAGS= -g
OBJS= common.o utils.o mem.o allcodecs.o \
- mpegvideo.o h263.o jrevdct.o jfdctfst.o jfdctint.o\
- mpegaudio.o ac3enc.o mjpeg.o resample.o dsputil.o \
+ mpegvideo.o h263.o jrevdct.o jfdctfst.o jfdctint.o \
+ resample.o dsputil.o \
motion_est.o imgconvert.o imgresample.o msmpeg4.o \
- mpeg12.o h263dec.o svq1.o rv10.o mpegaudiodec.o pcm.o simple_idct.o \
- ratecontrol.o adpcm.o eval.o dv.o error_resilience.o \
- wmadec.o fft.o mdct.o mace.o huffyuv.o
+ mpeg12.o h263dec.o pcm.o simple_idct.o \
+ ratecontrol.o adpcm.o eval.o error_resilience.o \
+ fft.o mdct.o
ASM_OBJS=
# currently using liba52 for ac3 decoding
diff -aur MPlayer-0.90rc2.orig/libavcodec/mpegvideo.c MPlayer-0.90rc2/libavcodec/mpegvideo.c
--- MPlayer-0.90rc2.orig/libavcodec/mpegvideo.c 2002-12-25 02:44:59.000000000 +0800
+++ MPlayer-0.90rc2/libavcodec/mpegvideo.c 2008-09-06 21:57:20.000000000 +0800
@@ -599,22 +599,6 @@
s->out_format = FMT_MPEG1;
avctx->delay=0; //FIXME not sure, should check the spec
break;
- case CODEC_ID_MJPEG:
- s->out_format = FMT_MJPEG;
- s->intra_only = 1; /* force intra only for jpeg */
- s->mjpeg_write_tables = 1; /* write all tables */
- s->mjpeg_data_only_frames = 0; /* write all the needed headers */
- s->mjpeg_vsample[0] = 2; /* set up default sampling factors */
- s->mjpeg_vsample[1] = 1; /* the only currently supported values */
- s->mjpeg_vsample[2] = 1;
- s->mjpeg_hsample[0] = 2;
- s->mjpeg_hsample[1] = 1;
- s->mjpeg_hsample[2] = 1;
- if (mjpeg_init(s) < 0)
- return -1;
- avctx->delay=0;
- s->low_delay=1;
- break;
case CODEC_ID_H263:
if (h263_get_picture_format(s->width, s->height) == 7) {
printf("Input picture size isn't suitable for h263 codec! try h263+\n");
@@ -636,12 +620,6 @@
avctx->delay=0;
s->low_delay=1;
break;
- case CODEC_ID_RV10:
- s->out_format = FMT_H263;
- s->h263_rv10 = 1;
- avctx->delay=0;
- s->low_delay=1;
- break;
case CODEC_ID_MPEG4:
s->out_format = FMT_H263;
s->h263_pred = 1;
@@ -752,13 +730,6 @@
}
/* precompute matrix */
- /* for mjpeg, we do include qscale in the matrix */
- if (s->out_format != FMT_MJPEG) {
- convert_matrix(s, s->q_intra_matrix, s->q_intra_matrix16, s->q_intra_matrix16_bias,
- s->intra_matrix, s->intra_quant_bias, 1, 31);
- convert_matrix(s, s->q_inter_matrix, s->q_inter_matrix16, s->q_inter_matrix16_bias,
- s->inter_matrix, s->inter_quant_bias, 1, 31);
- }
if(ff_rate_control_init(s) < 0)
return -1;
@@ -784,8 +755,6 @@
ff_rate_control_uninit(s);
MPV_common_end(s);
- if (s->out_format == FMT_MJPEG)
- mjpeg_close(s);
return 0;
}
@@ -914,14 +883,6 @@
void MPV_frame_end(MpegEncContext *s)
{
int i;
- /* draw edge for correct motion prediction if outside */
- if(s->codec_id!=CODEC_ID_SVQ1){
- if (s->pict_type != B_TYPE && !s->intra_only && !(s->flags&CODEC_FLAG_EMU_EDGE)) {
- draw_edges(s->current_picture.data[0], s->linesize , s->h_edge_pos , s->v_edge_pos , EDGE_WIDTH );
- draw_edges(s->current_picture.data[1], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2);
- draw_edges(s->current_picture.data[2], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2);
- }
- }
emms_c();
s->last_pict_type = s->pict_type;
@@ -1230,9 +1191,6 @@
MPV_frame_end(s);
- if (s->out_format == FMT_MJPEG)
- mjpeg_picture_trailer(s);
-
if(s->flags&CODEC_FLAG_PASS1)
ff_write_pass1_stats(s);
}
@@ -2539,13 +2497,6 @@
}
#endif
/* DCT & quantize */
- if(s->out_format==FMT_MJPEG){
- for(i=0;i<6;i++) {
- int overflow;
- s->block_last_index[i] = s->dct_quantize(s, s->block[i], i, 8, &overflow);
- if (overflow) clip_coeffs(s, s->block[i], s->block_last_index[i]);
- }
- }else{
for(i=0;i<6;i++) {
if(!skip_dct[i]){
int overflow;
@@ -2563,7 +2514,6 @@
if(s->chroma_elim_threshold && !s->mb_intra)
for(i=4; i<6; i++)
dct_single_coeff_elimination(s, i, s->chroma_elim_threshold);
- }
if((s->flags&CODEC_FLAG_GRAY) && s->mb_intra){
s->block_last_index[4]=
@@ -2586,9 +2536,6 @@
else
h263_encode_mb(s, s->block, motion_x, motion_y);
break;
- case FMT_MJPEG:
- mjpeg_encode_mb(s, s->block);
- break;
}
#endif
}
@@ -2842,18 +2789,6 @@
}else
s->qscale= (int)(s->frame_qscale + 0.5);
- if (s->out_format == FMT_MJPEG) {
- /* for mjpeg, we do include qscale in the matrix */
- s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0];
- for(i=1;i<64;i++){
- int j= s->idct_permutation[i];
-
- s->intra_matrix[j] = CLAMP_TO_8BIT((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3);
- }
- convert_matrix(s, s->q_intra_matrix, s->q_intra_matrix16,
- s->q_intra_matrix16_bias, s->intra_matrix, s->intra_quant_bias, 8, 8);
- }
-
//FIXME var duplication
s->current_picture.key_frame= s->pict_type == I_TYPE;
s->current_picture.pict_type= s->pict_type;
@@ -2863,16 +2798,11 @@
s->last_bits= get_bit_count(&s->pb);
switch(s->out_format) {
- case FMT_MJPEG:
- mjpeg_picture_header(s);
- break;
case FMT_H263:
if (s->h263_msmpeg4)
msmpeg4_encode_picture_header(s, picture_number);
else if (s->h263_pred)
mpeg4_encode_picture_header(s, picture_number);
- else if (s->h263_rv10)
- rv10_encode_picture_header(s, picture_number);
else
h263_encode_picture_header(s, picture_number);
break;
@@ -3504,26 +3434,6 @@
MPV_encode_end,
};
-AVCodec rv10_encoder = {
- "rv10",
- CODEC_TYPE_VIDEO,
- CODEC_ID_RV10,
- sizeof(MpegEncContext),
- MPV_encode_init,
- MPV_encode_picture,
- MPV_encode_end,
-};
-
-AVCodec mjpeg_encoder = {
- "mjpeg",
- CODEC_TYPE_VIDEO,
- CODEC_ID_MJPEG,
- sizeof(MpegEncContext),
- MPV_encode_init,
- MPV_encode_picture,
- MPV_encode_end,
-};
-
AVCodec mpeg4_encoder = {
"mpeg4",
CODEC_TYPE_VIDEO,
diff -aur MPlayer-0.90rc2.orig/libavcodec/mpegvideo.h MPlayer-0.90rc2/libavcodec/mpegvideo.h
--- MPlayer-0.90rc2.orig/libavcodec/mpegvideo.h 2002-12-25 02:44:59.000000000 +0800
+++ MPlayer-0.90rc2/libavcodec/mpegvideo.h 2008-09-06 21:57:20.000000000 +0800
@@ -25,7 +25,6 @@
enum OutputFormat {
FMT_MPEG1,
FMT_H263,
- FMT_MJPEG,
};
#define EDGE_WIDTH 16
@@ -143,7 +142,6 @@
/* the following codec id fields are deprecated in favor of codec_id */
int h263_plus; /* h263 plus headers */
- int h263_rv10; /* use RV10 variation for H263 */
int h263_msmpeg4; /* generate MSMPEG4 compatible stream (deprecated, use msmpeg4_version instead)*/
int h263_intel; /* use I263 intel h263 header */
@@ -430,18 +428,6 @@
int ffmpeg_version;
int lavc_build;
- /* RV10 specific */
- int rv10_version; /* RV10 version: 0 or 3 */
- int rv10_first_dc_coded[3];
-
- /* MJPEG specific */
- struct MJpegContext *mjpeg_ctx;
- int mjpeg_vsample[3]; /* vertical sampling factors, default = {2, 1, 1} */
- int mjpeg_hsample[3]; /* horizontal sampling factors, default = {2, 1, 1} */
- int mjpeg_write_tables; /* do we want to have quantisation- and
- huffmantables in the jpeg file ? */
- int mjpeg_data_only_frames; /* frames only with SOI, SOS and EOI markers */
-
/* MSMPEG4 specific */
int mv_table_index;
int rl_table_index;
@@ -669,11 +655,6 @@
int ff_h263_get_gob_height(MpegEncContext *s);
-/* rv10.c */
-void rv10_encode_picture_header(MpegEncContext *s, int picture_number);
-int rv_decode_dc(MpegEncContext *s, int n);
-
-
/* msmpeg4.c */
void msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number);
void msmpeg4_encode_ext_header(MpegEncContext * s);
@@ -686,15 +667,6 @@
void ff_msmpeg4_encode_init(MpegEncContext *s);
-/* mjpegenc.c */
-int mjpeg_init(MpegEncContext *s);
-void mjpeg_close(MpegEncContext *s);
-void mjpeg_encode_mb(MpegEncContext *s,
- DCTELEM block[6][64]);
-void mjpeg_picture_header(MpegEncContext *s);
-void mjpeg_picture_trailer(MpegEncContext *s);
-
-
/* rate control */
int ff_rate_control_init(MpegEncContext *s);
float ff_rate_estimate_qscale(MpegEncContext *s);
diff -aur MPlayer-0.90rc2.orig/libavcodec/utils.c MPlayer-0.90rc2/libavcodec/utils.c
--- MPlayer-0.90rc2.orig/libavcodec/utils.c 2002-12-25 02:44:59.000000000 +0800
+++ MPlayer-0.90rc2/libavcodec/utils.c 2008-09-06 21:57:20.000000000 +0800
@@ -160,9 +160,7 @@
pixel_size=1;
}
- if(s->codec_id==CODEC_ID_SVQ1) align=63;
- else align=15;
-
+ align=15;
w= (width +align)&~align;
h= (height+align)&~align;
@@ -660,9 +658,6 @@
switch(avctx->codec_id){
case CODEC_ID_MPEG1VIDEO:
case CODEC_ID_H263:
- case CODEC_ID_RV10:
- case CODEC_ID_MJPEG:
- case CODEC_ID_MJPEGB:
case CODEC_ID_MPEG4:
case CODEC_ID_MSMPEG4V1:
case CODEC_ID_MSMPEG4V2:
@@ -671,13 +666,6 @@
case CODEC_ID_WMV2:
case CODEC_ID_H263P:
case CODEC_ID_H263I:
- case CODEC_ID_SVQ1:
- for(i=0; i<MAX_PICTURE_COUNT; i++){
- if(s->picture[i].data[0] && ( s->picture[i].type == FF_BUFFER_TYPE_INTERNAL
- || s->picture[i].type == FF_BUFFER_TYPE_USER))
- avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]);
- }
- break;
default:
//FIXME
break;
diff -aur MPlayer-0.90rc2.orig/libmpcodecs/ad.c MPlayer-0.90rc2/libmpcodecs/ad.c
--- MPlayer-0.90rc2.orig/libmpcodecs/ad.c 2002-12-02 00:40:05.000000000 +0800
+++ MPlayer-0.90rc2/libmpcodecs/ad.c 2008-09-06 21:57:20.000000000 +0800
@@ -16,38 +16,22 @@
/* Missed vorbis, mad, dshow */
//extern ad_functions_t mpcodecs_ad_null;
-extern ad_functions_t mpcodecs_ad_mp3lib;
extern ad_functions_t mpcodecs_ad_ffmpeg;
extern ad_functions_t mpcodecs_ad_liba52;
-extern ad_functions_t mpcodecs_ad_hwac3;
extern ad_functions_t mpcodecs_ad_pcm;
extern ad_functions_t mpcodecs_ad_dvdpcm;
extern ad_functions_t mpcodecs_ad_alaw;
extern ad_functions_t mpcodecs_ad_imaadpcm;
extern ad_functions_t mpcodecs_ad_msadpcm;
-extern ad_functions_t mpcodecs_ad_dk3adpcm;
-extern ad_functions_t mpcodecs_ad_dk4adpcm;
-extern ad_functions_t mpcodecs_ad_roqaudio;
-extern ad_functions_t mpcodecs_ad_dshow;
-extern ad_functions_t mpcodecs_ad_dmo;
-extern ad_functions_t mpcodecs_ad_acm;
-extern ad_functions_t mpcodecs_ad_msgsm;
extern ad_functions_t mpcodecs_ad_faad;
extern ad_functions_t mpcodecs_ad_libvorbis;
extern ad_functions_t mpcodecs_ad_libmad;
-extern ad_functions_t mpcodecs_ad_realaud;
-extern ad_functions_t mpcodecs_ad_libdv;
-extern ad_functions_t mpcodecs_ad_qtaudio;
ad_functions_t* mpcodecs_ad_drivers[] =
{
// &mpcodecs_ad_null,
-#ifdef USE_MP3LIB
- &mpcodecs_ad_mp3lib,
-#endif
#ifdef USE_LIBA52
&mpcodecs_ad_liba52,
- &mpcodecs_ad_hwac3,
#endif
#ifdef USE_LIBAVCODEC
&mpcodecs_ad_ffmpeg,
@@ -57,19 +41,6 @@
&mpcodecs_ad_alaw,
&mpcodecs_ad_imaadpcm,
&mpcodecs_ad_msadpcm,
- &mpcodecs_ad_dk3adpcm,
- &mpcodecs_ad_roqaudio,
- &mpcodecs_ad_msgsm,
-#ifdef USE_WIN32DLL
-#ifdef USE_DIRECTSHOW
- &mpcodecs_ad_dshow,
- &mpcodecs_ad_dmo,
-#endif
- &mpcodecs_ad_acm,
-#endif
-#ifdef USE_QTX_CODECS
- &mpcodecs_ad_qtaudio,
-#endif
#ifdef HAVE_FAAD
&mpcodecs_ad_faad,
#endif
@@ -79,11 +50,5 @@
#ifdef USE_LIBMAD
&mpcodecs_ad_libmad,
#endif
-#ifdef USE_REALCODECS
- &mpcodecs_ad_realaud,
-#endif
-#ifdef HAVE_LIBDV095
- &mpcodecs_ad_libdv,
-#endif
NULL
};
diff -aur MPlayer-0.90rc2.orig/libmpcodecs/ad.h MPlayer-0.90rc2/libmpcodecs/ad.h
--- MPlayer-0.90rc2.orig/libmpcodecs/ad.h 2002-03-26 03:53:41.000000000 +0800
+++ MPlayer-0.90rc2/libmpcodecs/ad.h 2008-09-06 21:57:20.000000000 +0800
@@ -26,5 +26,5 @@
#define ADCTRL_QUERY_FORMAT 3 /* test for availabilty of a format */
// fallback: use hw mixer in libao
-#define ADCTRL_SET_VOLUME 4 /* set volume (used for mp3lib and liba52) */
+#define ADCTRL_SET_VOLUME 4 /* set volume (used for liba52) */
diff -aur MPlayer-0.90rc2.orig/libmpcodecs/ad_libmad.c MPlayer-0.90rc2/libmpcodecs/ad_libmad.c
--- MPlayer-0.90rc2.orig/libmpcodecs/ad_libmad.c 2002-08-31 05:44:20.000000000 +0800
+++ MPlayer-0.90rc2/libmpcodecs/ad_libmad.c 2008-09-06 22:00:17.000000000 +0800
@@ -67,7 +67,6 @@
int num_bytes =
(char*)sh->a_in_buffer+sh->a_in_buffer_len - (char*)this->stream.next_frame;
memmove(sh->a_in_buffer, this->stream.next_frame, num_bytes);
- mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"libmad: %d bytes processed\n",sh->a_in_buffer_len-num_bytes);
sh->a_in_buffer_len = num_bytes;
}
if (ret == 0) return 1; // OK!!!
@@ -75,7 +74,6 @@
if(this->stream.error==MAD_ERROR_BUFLEN) break;
}
}
-mp_msg(MSGT_DECAUDIO,MSGL_INFO,"Cannot sync MAD frame\n");
return 0;
}
diff -aur MPlayer-0.90rc2.orig/libmpcodecs/Makefile MPlayer-0.90rc2/libmpcodecs/Makefile
--- MPlayer-0.90rc2.orig/libmpcodecs/Makefile 2002-12-16 09:49:39.000000000 +0800
+++ MPlayer-0.90rc2/libmpcodecs/Makefile 2008-09-06 21:57:20.000000000 +0800
@@ -4,20 +4,20 @@
LIBNAME = libmpcodecs.a
LIBNAME2 = libmpencoders.a
-AUDIO_SRCS_LIB=ad_liba52.c ad_hwac3.c ad_mp3lib.c
-AUDIO_SRCS_NAT=ad_alaw.c ad_dk3adpcm.c ad_pcm.c ad_dvdpcm.c ad_imaadpcm.c ad_msadpcm.c ad_msgsm.c ad_roqaudio.c
-AUDIO_SRCS_OPT=ad_acm.c ad_dshow.c ad_dmo.c ad_qtaudio.c ad_ffmpeg.c ad_faad.c ad_libvorbis.c ad_libmad.c ad_realaud.c ad_libdv.c
+AUDIO_SRCS_LIB=ad_liba52.c
+AUDIO_SRCS_NAT=ad_alaw.c ad_pcm.c ad_dvdpcm.c ad_imaadpcm.c ad_msadpcm.c
+AUDIO_SRCS_OPT=ad_ffmpeg.c ad_faad.c ad_libvorbis.c ad_libmad.c
AUDIO_SRCS=dec_audio.c ad.c $(AUDIO_SRCS_LIB) $(AUDIO_SRCS_NAT) $(AUDIO_SRCS_OPT)
-VIDEO_SRCS_LIB=vd_libmpeg2.c vd_nuv.c vd_lzo.c
-VIDEO_SRCS_NAT=vd_null.c vd_cinepak.c vd_qtrpza.c vd_raw.c vd_msvidc.c vd_fli.c vd_qtrle.c vd_qtsmc.c vd_roqvideo.c vd_cyuv.c vd_msrle.c vd_huffyuv.c vd_mpegpes.c vd_svq1.c vd_lcl.c vd_mtga.c
-VIDEO_SRCS_OPT=vd_realvid.c vd_ffmpeg.c vd_dshow.c vd_dmo.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_xanim.c vd_xvid.c vd_libdv.c vd_qtvideo.c
+VIDEO_SRCS_LIB=
+VIDEO_SRCS_NAT=vd_null.c vd_raw.c
+VIDEO_SRCS_OPT=vd_ffmpeg.c
VIDEO_SRCS=dec_video.c vd.c $(VIDEO_SRCS_NAT) $(VIDEO_SRCS_LIB) $(VIDEO_SRCS_OPT)
-VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c
-ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c ve_xvid.c ve_qtvideo.c
+VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_cropdetect.c vf_test.c vf_lavcdeint.c
+ENCODER_SRCS=
-NATIVE_SRCS=native/RTjpegN.c native/cinepak.c native/cyuv.c native/fli.c native/minilzo.c native/msvidc.c native/nuppelvideo.c native/qtrle.c native/qtrpza.c native/qtsmc.c native/roqav.c native/xa_gsm.c native/svq1.c
+NATIVE_SRCS=
ifeq ($(FAME),yes)
VFILTER_SRCS += vf_fame.c
diff -aur MPlayer-0.90rc2.orig/libmpcodecs/vd.c MPlayer-0.90rc2/libmpcodecs/vd.c
--- MPlayer-0.90rc2.orig/libmpcodecs/vd.c 2002-11-27 06:54:59.000000000 +0800
+++ MPlayer-0.90rc2/libmpcodecs/vd.c 2008-09-06 21:57:20.000000000 +0800
@@ -26,101 +26,15 @@
//#include "vd_internal.h"
extern vd_functions_t mpcodecs_vd_null;
-extern vd_functions_t mpcodecs_vd_cinepak;
-extern vd_functions_t mpcodecs_vd_qtrpza;
extern vd_functions_t mpcodecs_vd_ffmpeg;
-extern vd_functions_t mpcodecs_vd_dshow;
-extern vd_functions_t mpcodecs_vd_dmo;
-extern vd_functions_t mpcodecs_vd_vfw;
-extern vd_functions_t mpcodecs_vd_vfwex;
-extern vd_functions_t mpcodecs_vd_odivx;
-extern vd_functions_t mpcodecs_vd_divx4;
extern vd_functions_t mpcodecs_vd_raw;
-extern vd_functions_t mpcodecs_vd_xanim;
-extern vd_functions_t mpcodecs_vd_msrle;
-extern vd_functions_t mpcodecs_vd_msvidc;
-extern vd_functions_t mpcodecs_vd_fli;
-extern vd_functions_t mpcodecs_vd_qtrle;
-extern vd_functions_t mpcodecs_vd_qtsmc;
-extern vd_functions_t mpcodecs_vd_roqvideo;
-extern vd_functions_t mpcodecs_vd_cyuv;
-extern vd_functions_t mpcodecs_vd_nuv;
-extern vd_functions_t mpcodecs_vd_mpng;
-extern vd_functions_t mpcodecs_vd_ijpg;
-extern vd_functions_t mpcodecs_vd_mtga;
-extern vd_functions_t mpcodecs_vd_libmpeg2;
-extern vd_functions_t mpcodecs_vd_huffyuv;
-extern vd_functions_t mpcodecs_vd_mpegpes;
-extern vd_functions_t mpcodecs_vd_realvid;
-extern vd_functions_t mpcodecs_vd_svq1;
-extern vd_functions_t mpcodecs_vd_xvid;
-extern vd_functions_t mpcodecs_vd_libdv;
-extern vd_functions_t mpcodecs_vd_lcl;
-extern vd_functions_t mpcodecs_vd_lzo;
-extern vd_functions_t mpcodecs_vd_qtvideo;
vd_functions_t* mpcodecs_vd_drivers[] = {
&mpcodecs_vd_null,
- &mpcodecs_vd_cinepak,
- &mpcodecs_vd_qtrpza,
#ifdef USE_LIBAVCODEC
&mpcodecs_vd_ffmpeg,
#endif
-#ifdef USE_WIN32DLL
-#ifdef USE_DIRECTSHOW
- &mpcodecs_vd_dshow,
- &mpcodecs_vd_dmo,
-#endif
- &mpcodecs_vd_vfw,
- &mpcodecs_vd_vfwex,
-#endif
-#ifdef USE_DIVX
- &mpcodecs_vd_odivx,
-#ifdef NEW_DECORE
- &mpcodecs_vd_divx4,
-#endif
-#endif
- &mpcodecs_vd_lzo,
&mpcodecs_vd_raw,
- &mpcodecs_vd_msrle,
- &mpcodecs_vd_msvidc,
- &mpcodecs_vd_fli,
- &mpcodecs_vd_qtrle,
- &mpcodecs_vd_qtsmc,
- &mpcodecs_vd_roqvideo,
- &mpcodecs_vd_cyuv,
- &mpcodecs_vd_nuv,
-#ifdef USE_XANIM
- &mpcodecs_vd_xanim,
-#endif
-#ifdef HAVE_PNG
- &mpcodecs_vd_mpng,
-#endif
-#ifdef HAVE_JPEG
- &mpcodecs_vd_ijpg,
-#endif
- &mpcodecs_vd_mtga,
-#ifdef USE_LIBMPEG2
- &mpcodecs_vd_libmpeg2,
-#endif
- &mpcodecs_vd_huffyuv,
- &mpcodecs_vd_mpegpes,
-#ifdef USE_REALCODECS
- &mpcodecs_vd_realvid,
-#endif
-#ifdef USE_SVQ1
- &mpcodecs_vd_svq1,
-#endif
-#ifdef HAVE_XVID
- &mpcodecs_vd_xvid,
-#endif
-#ifdef HAVE_LIBDV095
- &mpcodecs_vd_libdv,
-#endif
- &mpcodecs_vd_lcl,
-#ifdef USE_QTX_CODECS
- &mpcodecs_vd_qtvideo,
-#endif
NULL
};
diff -aur MPlayer-0.90rc2.orig/libmpcodecs/vf.c MPlayer-0.90rc2/libmpcodecs/vf.c
--- MPlayer-0.90rc2.orig/libmpcodecs/vf.c 2002-12-05 08:22:37.000000000 +0800
+++ MPlayer-0.90rc2/libmpcodecs/vf.c 2008-09-06 21:57:20.000000000 +0800
@@ -16,8 +16,6 @@
#include "vf.h"
extern vf_info_t vf_info_vo;
-extern vf_info_t vf_info_rectangle;
-extern vf_info_t vf_info_bmovl;
extern vf_info_t vf_info_crop;
extern vf_info_t vf_info_expand;
extern vf_info_t vf_info_pp;
@@ -26,39 +24,14 @@
extern vf_info_t vf_info_fame;
#endif
extern vf_info_t vf_info_format;
-extern vf_info_t vf_info_yuy2;
-extern vf_info_t vf_info_flip;
-extern vf_info_t vf_info_rgb2bgr;
-extern vf_info_t vf_info_rotate;
-extern vf_info_t vf_info_mirror;
-extern vf_info_t vf_info_palette;
-extern vf_info_t vf_info_lavc;
-extern vf_info_t vf_info_dvbscale;
extern vf_info_t vf_info_cropdetect;
extern vf_info_t vf_info_test;
-extern vf_info_t vf_info_noise;
-extern vf_info_t vf_info_yvu9;
extern vf_info_t vf_info_lavcdeint;
-extern vf_info_t vf_info_eq;
-extern vf_info_t vf_info_eq2;
-extern vf_info_t vf_info_halfpack;
-extern vf_info_t vf_info_dint;
-extern vf_info_t vf_info_1bpp;
-extern vf_info_t vf_info_2xsai;
-extern vf_info_t vf_info_unsharp;
-extern vf_info_t vf_info_swapuv;
-extern vf_info_t vf_info_il;
-extern vf_info_t vf_info_boxblur;
-extern vf_info_t vf_info_sab;
-extern vf_info_t vf_info_smartblur;
-extern vf_info_t vf_info_perspective;
char** vo_plugin_args=(char**) NULL;
// list of available filters:
static vf_info_t* filter_list[]={
- &vf_info_rectangle,
- &vf_info_bmovl,
&vf_info_crop,
&vf_info_expand,
&vf_info_pp,
@@ -69,34 +42,11 @@
&vf_info_fame,
#endif
&vf_info_format,
- &vf_info_yuy2,
- &vf_info_flip,
- &vf_info_rgb2bgr,
- &vf_info_rotate,
- &vf_info_mirror,
- &vf_info_palette,
#ifdef USE_LIBAVCODEC
- &vf_info_lavc,
&vf_info_lavcdeint,
#endif
- &vf_info_dvbscale,
&vf_info_cropdetect,
&vf_info_test,
- &vf_info_noise,
- &vf_info_yvu9,
- &vf_info_eq,
- &vf_info_eq2,
- &vf_info_halfpack,
- &vf_info_dint,
- &vf_info_1bpp,
- &vf_info_2xsai,
- &vf_info_unsharp,
- &vf_info_swapuv,
- &vf_info_il,
- &vf_info_boxblur,
- &vf_info_sab,
- &vf_info_smartblur,
- &vf_info_perspective,
NULL
};
diff -aur MPlayer-0.90rc2.orig/libmpdemux/demuxer.c MPlayer-0.90rc2/libmpdemux/demuxer.c
--- MPlayer-0.90rc2.orig/libmpdemux/demuxer.c 2002-12-23 05:01:01.000000000 +0800
+++ MPlayer-0.90rc2/libmpdemux/demuxer.c 2008-09-06 21:57:20.000000000 +0800
@@ -115,23 +115,13 @@
free(sh);
}
-extern void demux_close_vivo(demuxer_t *demuxer);
-extern void demux_close_real(demuxer_t *demuxer);
-extern void demux_close_y4m(demuxer_t *demuxer);
extern void demux_close_mf(demuxer_t* demuxer);
-extern void demux_close_roq(demuxer_t* demuxer);
-extern void demux_close_film(demuxer_t* demuxer);
extern void demux_close_bmp(demuxer_t* demuxer);
-extern void demux_close_fli(demuxer_t* demuxer);
-extern void demux_close_nuv(demuxer_t* demuxer);
extern void demux_close_audio(demuxer_t* demuxer);
extern void demux_close_ogg(demuxer_t* demuxer);
extern void demux_close_rtp(demuxer_t* demuxer);
extern void demux_close_demuxers(demuxer_t* demuxer);
extern void demux_close_avi(demuxer_t *demuxer);
-extern void demux_close_rawdv(demuxer_t* demuxer);
-extern void demux_close_pva(demuxer_t* demuxer);
-extern void demux_close_smjpeg(demuxer_t* demuxer);
extern void demux_close_xmms(demuxer_t* demuxer);
#ifdef USE_TV
@@ -149,34 +139,14 @@
int i;
mp_msg(MSGT_DEMUXER,MSGL_V,"DEMUXER: freeing demuxer at %p \n",demuxer);
switch(demuxer->type) {
- case DEMUXER_TYPE_PVA:
- demux_close_pva(demuxer); break;
- case DEMUXER_TYPE_VIVO:
- demux_close_vivo(demuxer); break;
- case DEMUXER_TYPE_REAL:
- demux_close_real(demuxer); break;
- case DEMUXER_TYPE_Y4M:
- demux_close_y4m(demuxer); break;
case DEMUXER_TYPE_MF:
demux_close_mf(demuxer); break;
- case DEMUXER_TYPE_ROQ:
- demux_close_roq(demuxer); break;
- case DEMUXER_TYPE_FILM:
- demux_close_film(demuxer); break;
case DEMUXER_TYPE_BMP:
demux_close_bmp(demuxer); break;
- case DEMUXER_TYPE_FLI:
- demux_close_fli(demuxer); break;
- case DEMUXER_TYPE_NUV:
- demux_close_nuv(demuxer); break;
#if defined(USE_TV) && defined(HAVE_TV_V4L)
case DEMUXER_TYPE_TV:
demux_close_tv(demuxer); break;
#endif
-#ifdef HAVE_LIBDV095
- case DEMUXER_TYPE_RAWDV:
- demux_close_rawdv(demuxer); break;
-#endif
case DEMUXER_TYPE_AUDIO:
demux_close_audio(demuxer); break;
#ifdef HAVE_OGGVORBIS
@@ -187,8 +157,6 @@
case DEMUXER_TYPE_RTP:
demux_close_rtp(demuxer); break;
#endif
- case DEMUXER_TYPE_SMJPEG:
- demux_close_smjpeg(demuxer); return;
case DEMUXER_TYPE_DEMUXERS:
demux_close_demuxers(demuxer); return;
case DEMUXER_TYPE_AVI:
@@ -256,59 +224,36 @@
// 0 = EOF or no stream found or invalid type
// 1 = successfully read a packet
int demux_mf_fill_buffer( demuxer_t *demux);
-int demux_roq_fill_buffer(demuxer_t *demux);
-int demux_film_fill_buffer(demuxer_t *demux);
int demux_bmp_fill_buffer(demuxer_t *demux);
-int demux_fli_fill_buffer(demuxer_t *demux);
int demux_mpg_es_fill_buffer(demuxer_t *demux);
int demux_mpg_fill_buffer(demuxer_t *demux);
int demux_avi_fill_buffer(demuxer_t *demux);
int demux_avi_fill_buffer_ni(demuxer_t *demux,demux_stream_t *ds);
int demux_avi_fill_buffer_nini(demuxer_t *demux,demux_stream_t *ds);
int demux_asf_fill_buffer(demuxer_t *demux);
-int demux_mov_fill_buffer(demuxer_t *demux,demux_stream_t* ds);
-int demux_vivo_fill_buffer(demuxer_t *demux);
-int demux_real_fill_buffer(demuxer_t *demuxer);
-int demux_nuv_fill_buffer(demuxer_t *demux);
int demux_rtp_fill_buffer(demuxer_t *demux, demux_stream_t* ds);
-int demux_rawdv_fill_buffer(demuxer_t *demuxer);
-int demux_y4m_fill_buffer(demuxer_t *demux);
int demux_audio_fill_buffer(demux_stream_t *ds);
-int demux_pva_fill_buffer(demuxer_t *demux);
int demux_xmms_fill_buffer(demuxer_t *demux,demux_stream_t *ds);
extern int demux_demuxers_fill_buffer(demuxer_t *demux,demux_stream_t *ds);
extern int demux_ogg_fill_buffer(demuxer_t *d);
extern int demux_rawaudio_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds);
-extern int demux_smjpeg_fill_buffer(demuxer_t* demux);
int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){
// Note: parameter 'ds' can be NULL!
// printf("demux->type=%d\n",demux->type);
switch(demux->type){
case DEMUXER_TYPE_MF: return demux_mf_fill_buffer(demux);
- case DEMUXER_TYPE_ROQ: return demux_roq_fill_buffer(demux);
- case DEMUXER_TYPE_FILM: return demux_film_fill_buffer(demux);
case DEMUXER_TYPE_BMP: return demux_bmp_fill_buffer(demux);
- case DEMUXER_TYPE_FLI: return demux_fli_fill_buffer(demux);
case DEMUXER_TYPE_MPEG_ES: return demux_mpg_es_fill_buffer(demux);
case DEMUXER_TYPE_MPEG_PS: return demux_mpg_fill_buffer(demux);
case DEMUXER_TYPE_AVI: return demux_avi_fill_buffer(demux);
case DEMUXER_TYPE_AVI_NI: return demux_avi_fill_buffer_ni(demux,ds);
case DEMUXER_TYPE_AVI_NINI: return demux_avi_fill_buffer_nini(demux,ds);
case DEMUXER_TYPE_ASF: return demux_asf_fill_buffer(demux);
- case DEMUXER_TYPE_MOV: return demux_mov_fill_buffer(demux,ds);
- case DEMUXER_TYPE_VIVO: return demux_vivo_fill_buffer(demux);
- case DEMUXER_TYPE_PVA: return demux_pva_fill_buffer(demux);
-#ifdef HAVE_LIBDV095
- case DEMUXER_TYPE_RAWDV: return demux_rawdv_fill_buffer(demux);
-#endif
- case DEMUXER_TYPE_REAL: return demux_real_fill_buffer(demux);
- case DEMUXER_TYPE_NUV: return demux_nuv_fill_buffer(demux);
#ifdef USE_TV
case DEMUXER_TYPE_TV: return demux_tv_fill_buffer(demux, ds);
#endif
- case DEMUXER_TYPE_Y4M: return demux_y4m_fill_buffer(demux);
case DEMUXER_TYPE_AUDIO: return demux_audio_fill_buffer(ds);
#ifdef HAVE_XMMS
case DEMUXER_TYPE_XMMS: return demux_xmms_fill_buffer(demux,ds);
@@ -321,7 +266,6 @@
#ifdef STREAMING_LIVE_DOT_COM
case DEMUXER_TYPE_RTP: return demux_rtp_fill_buffer(demux, ds);
#endif
- case DEMUXER_TYPE_SMJPEG: return demux_smjpeg_fill_buffer(demux);
}
return 0;
}
@@ -516,32 +460,12 @@
demuxer_t* demux_open_avi(demuxer_t* demuxer);
int mov_check_file(demuxer_t* demuxer);
int mov_read_header(demuxer_t* demuxer);
-int demux_open_fli(demuxer_t* demuxer);
int demux_open_mf(demuxer_t* demuxer);
-int demux_open_film(demuxer_t* demuxer);
int demux_open_bmp(demuxer_t* demuxer);
-int demux_open_roq(demuxer_t* demuxer);
-#ifdef HAVE_LIBDV095
-int demux_open_rawdv(demuxer_t* demuxer);
-extern int rawdv_check_file(demuxer_t *demuxer);
-#endif
-
-extern int vivo_check_file(demuxer_t *demuxer);
-extern void demux_open_vivo(demuxer_t *demuxer);
-extern int y4m_check_file(demuxer_t *demuxer);
-extern void demux_open_y4m(demuxer_t *demuxer);
-extern int roq_check_file(demuxer_t *demuxer);
-extern int pva_check_file(demuxer_t * demuxer);
-extern demuxer_t * demux_open_pva(demuxer_t * demuxer);
-extern int real_check_file(demuxer_t *demuxer);
-extern void demux_open_real(demuxer_t *demuxer);
-extern int nuv_check_file(demuxer_t *demuxer);
-extern void demux_open_nuv(demuxer_t *demuxer);
+
extern int demux_audio_open(demuxer_t* demuxer);
extern int demux_ogg_open(demuxer_t* demuxer);
extern int demux_rawaudio_open(demuxer_t* demuxer);
-extern int smjpeg_check_file(demuxer_t *demuxer);
-extern int demux_open_smjpeg(demuxer_t* demuxer);
extern int bmp_check_file(demuxer_t *demuxer);
extern int demux_xmms_open(demuxer_t* demuxer);
@@ -612,17 +536,6 @@
}
}
}
-//=============== Try to open as Y4M file: =================
-if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_Y4M){
- demuxer=new_demuxer(stream,DEMUXER_TYPE_Y4M,audio_id,video_id,dvdsub_id);
- if(y4m_check_file(demuxer)){
- mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"YUV4MPEG2");
- file_format=DEMUXER_TYPE_Y4M;
- } else {
- free_demuxer(demuxer);
- demuxer = NULL;
- }
-}
//=============== Try to open as ASF file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ASF){
demuxer=new_demuxer(stream,DEMUXER_TYPE_ASF,audio_id,video_id,dvdsub_id);
@@ -634,93 +547,6 @@
demuxer = NULL;
}
}
-//=============== Try to open as NUV file: =================
-if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_NUV){
- demuxer=new_demuxer(stream,DEMUXER_TYPE_NUV,audio_id,video_id,dvdsub_id);
- if(nuv_check_file(demuxer)){
- mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"NuppelVideo");
- file_format=DEMUXER_TYPE_NUV;
- } else {
- free_demuxer(demuxer);
- demuxer = NULL;
- }
-}
-//=============== Try to open as MOV file: =================
-if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MOV){
- demuxer=new_demuxer(stream,DEMUXER_TYPE_MOV,audio_id,video_id,dvdsub_id);
- if(mov_check_file(demuxer)){
- mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"QuickTime/MOV");
- file_format=DEMUXER_TYPE_MOV;
- } else {
- free_demuxer(demuxer);
- demuxer = NULL;
- }
-}
-//=============== Try to open as VIVO file: =================
-if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_VIVO){
- demuxer=new_demuxer(stream,DEMUXER_TYPE_VIVO,audio_id,video_id,dvdsub_id);
- if(vivo_check_file(demuxer)){
- mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat, "VIVO");
- file_format=DEMUXER_TYPE_VIVO;
- } else {
- free_demuxer(demuxer);
- demuxer = NULL;
- }
-}
-//=============== Try to open as REAL file: =================
-if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_REAL){
- demuxer=new_demuxer(stream,DEMUXER_TYPE_REAL,audio_id,video_id,dvdsub_id);
- if(real_check_file(demuxer)){
- mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"REAL");
- file_format=DEMUXER_TYPE_REAL;
- } else {
- free_demuxer(demuxer);
- demuxer = NULL;
- }
-}
-//=============== Try to open as FLI file: =================
-if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_FLI){
- demuxer=new_demuxer(stream,DEMUXER_TYPE_FLI,audio_id,video_id,dvdsub_id);
- {
- int id;
- stream_seek(demuxer->stream, 4);
- id=stream_read_word_le(demuxer->stream);
- // check for the FLI file magic number
- if((id==0xAF11) || (id==0xAF12)){
- mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"FLI");
- file_format=DEMUXER_TYPE_FLI;
- } else {
- free_demuxer(demuxer);
- demuxer = NULL;
- }
- }
-}
-//=============== Try to open as FILM file: =================
-if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_FILM){
- demuxer=new_demuxer(stream,DEMUXER_TYPE_FILM,audio_id,video_id,dvdsub_id);
- {
- int signature=stream_read_fourcc(demuxer->stream);
- // check for the FLI file magic number
- if(signature==mmioFOURCC('F', 'I', 'L', 'M')){
- mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"FILM");
- file_format=DEMUXER_TYPE_FILM;
- } else {
- free_demuxer(demuxer);
- demuxer = NULL;
- }
- }
-}
-//=============== Try to open as RoQ file: =================
-if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ROQ){
- demuxer=new_demuxer(stream,DEMUXER_TYPE_ROQ,audio_id,video_id,dvdsub_id);
- if(roq_check_file(demuxer)){
- mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"ROQ");
- file_format=DEMUXER_TYPE_ROQ;
- } else {
- free_demuxer(demuxer);
- demuxer = NULL;
- }
-}
//=============== Try to open as BMP file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_BMP){
demuxer=new_demuxer(stream,DEMUXER_TYPE_BMP,audio_id,video_id,dvdsub_id);
@@ -732,17 +558,6 @@
demuxer = NULL;
}
}
-//=============== Try to open as SMJPEG file: =================
-if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_SMJPEG){
- demuxer=new_demuxer(stream,DEMUXER_TYPE_SMJPEG,audio_id,video_id,dvdsub_id);
- if(smjpeg_check_file(demuxer)){
- mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"SMJPEG");
- file_format=DEMUXER_TYPE_SMJPEG;
- } else {
- free_demuxer(demuxer);
- demuxer = NULL;
- }
-}
#ifdef HAVE_OGGVORBIS
//=============== Try to open as Ogg file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_OGG){
@@ -756,17 +571,6 @@
}
}
#endif
-//=============== Try to open as PVA file: =================
-if(file_format == DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_PVA){
- demuxer=new_demuxer(stream,DEMUXER_TYPE_PVA,audio_id,video_id,dvdsub_id);
- if(pva_check_file(demuxer)) {
- mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"PVA");
- file_format=DEMUXER_TYPE_PVA;
- } else {
- free_demuxer(demuxer);
- demuxer=NULL;
- }
-}
//=============== Try to open as MPEG-PS file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){
int pes=1;
@@ -836,20 +640,6 @@
mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"MPEG-ES");
}
}
-#ifdef HAVE_LIBDV095
-//=============== Try to open raw DV file, as produced by dvgrab --format raw =================
-if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_RAWDV)
-{
- demuxer=new_demuxer(stream,DEMUXER_TYPE_RAWDV,audio_id,video_id,dvdsub_id);
- if(rawdv_check_file(demuxer))
- {
- mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"RAWDV");
- file_format=DEMUXER_TYPE_RAWDV;
- }
- else
- free_demuxer(demuxer);
-}
-#endif
//=============== Try to open as audio file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AUDIO){
demuxer=new_demuxer(stream,DEMUXER_TYPE_AUDIO,audio_id,video_id,dvdsub_id);
@@ -892,13 +682,6 @@
demuxer->file_format=file_format;
switch(file_format){
-#ifdef HAVE_LIBDV095
- case DEMUXER_TYPE_RAWDV:
- {
- if (!demux_open_rawdv(demuxer)) return NULL;
- break;
- }
-#endif
case DEMUXER_TYPE_RAWAUDIO: {
demux_rawaudio_open(demuxer);
break;
@@ -907,32 +690,10 @@
if (!demux_open_mf(demuxer)) return NULL;
break;
}
- case DEMUXER_TYPE_FLI: {
- if (!demux_open_fli(demuxer)) return NULL;
- break;
- }
- case DEMUXER_TYPE_FILM: {
- if (!demux_open_film(demuxer)) return NULL;
- break;
- }
case DEMUXER_TYPE_BMP: {
if (!demux_open_bmp(demuxer)) return NULL;
break;
}
- case DEMUXER_TYPE_ROQ: {
- if (!demux_open_roq(demuxer)) return NULL;
- break;
- }
- case DEMUXER_TYPE_SMJPEG: {
- if (!demux_open_smjpeg(demuxer)) return NULL;
- break;
- }
- case DEMUXER_TYPE_MOV: {
- if(!mov_read_header(demuxer)) return NULL;
-// sh_video=d_video->sh;if(sh_video) sh_video->ds=d_video;
-// sh_audio=d_audio->sh;if(sh_audio) sh_audio->ds=d_audio;
- break;
- }
case DEMUXER_TYPE_AVI: {
sh_audio_t* sh_a;
demuxer = (demuxer_t*) demux_open_avi(demuxer);
@@ -960,26 +721,6 @@
return demuxer;
// break;
}
- case DEMUXER_TYPE_NUV: {
- demux_open_nuv(demuxer);
- break;
- }
- case DEMUXER_TYPE_VIVO: {
- demux_open_vivo(demuxer);
- break;
- }
- case DEMUXER_TYPE_PVA: {
- demux_open_pva(demuxer);
- break;
- }
- case DEMUXER_TYPE_Y4M: {
- demux_open_y4m(demuxer);
- break;
- }
- case DEMUXER_TYPE_REAL: {
- demux_open_real(demuxer);
- break;
- }
case DEMUXER_TYPE_ASF: {
//---- ASF header:
read_asf_header(demuxer);
@@ -1114,18 +855,7 @@
int demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,int flags);
int demux_seek_asf(demuxer_t *demuxer,float rel_seek_secs,int flags);
int demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags);
-int demux_seek_y4m(demuxer_t *demuxer,float rel_seek_secs,int flags);
-int demux_seek_fli(demuxer_t *demuxer,float rel_seek_secs,int flags);
-int demux_seek_film(demuxer_t *demuxer,float rel_seek_secs,int flags);
int demux_seek_mf(demuxer_t *demuxer,float rel_seek_secs,int flags);
-int demux_seek_nuv(demuxer_t *demuxer,float rel_seek_secs,int flags);
-void demux_seek_mov(demuxer_t *demuxer,float pts,int flags);
-int demux_seek_real(demuxer_t *demuxer,float rel_seek_secs,int flags);
-int demux_seek_pva(demuxer_t *demuxer,float rel_seek_secs,int flags);
-
-#ifdef HAVE_LIBDV095
-int demux_seek_rawdv(demuxer_t *demuxer, float pts, int flags);
-#endif
extern void demux_audio_seek(demuxer_t *demuxer,float rel_seek_secs,int flags);
extern void demux_demuxers_seek(demuxer_t *demuxer,float rel_seek_secs,int flags);
@@ -1168,10 +898,6 @@
switch(demuxer->file_format){
-#ifdef HAVE_LIBDV095
- case DEMUXER_TYPE_RAWDV:
- demux_seek_rawdv(demuxer,rel_seek_secs,flags); break;
-#endif
case DEMUXER_TYPE_AVI:
demux_seek_avi(demuxer,rel_seek_secs,flags); break;
@@ -1182,27 +908,9 @@
case DEMUXER_TYPE_MPEG_PS:
demux_seek_mpg(demuxer,rel_seek_secs,flags); break;
- case DEMUXER_TYPE_MOV:
- demux_seek_mov(demuxer,rel_seek_secs,flags); break;
-
- case DEMUXER_TYPE_REAL:
- demux_seek_real(demuxer,rel_seek_secs,flags); break;
-
- case DEMUXER_TYPE_Y4M:
- demux_seek_y4m(demuxer,rel_seek_secs,flags); break;
-
case DEMUXER_TYPE_MF:
demux_seek_mf(demuxer,rel_seek_secs,flags); break;
- case DEMUXER_TYPE_PVA:
- demux_seek_pva(demuxer,rel_seek_secs,flags); break;
-
- case DEMUXER_TYPE_FLI:
- demux_seek_fli(demuxer,rel_seek_secs,flags); break;
- case DEMUXER_TYPE_FILM:
- demux_seek_film(demuxer,rel_seek_secs,flags); break;
- case DEMUXER_TYPE_NUV:
- demux_seek_nuv(demuxer,rel_seek_secs,flags); break;
case DEMUXER_TYPE_AUDIO:
demux_audio_seek(demuxer,rel_seek_secs,flags); break;
case DEMUXER_TYPE_DEMUXERS:
diff -aur MPlayer-0.90rc2.orig/libmpdemux/demuxer.h MPlayer-0.90rc2/libmpdemux/demuxer.h
--- MPlayer-0.90rc2.orig/libmpdemux/demuxer.h 2002-12-23 05:01:01.000000000 +0800
+++ MPlayer-0.90rc2/libmpdemux/demuxer.h 2008-09-06 21:57:20.000000000 +0800
@@ -16,23 +16,14 @@
#define DEMUXER_TYPE_AVI_NINI 5
#define DEMUXER_TYPE_ASF 6
#define DEMUXER_TYPE_MOV 7
-#define DEMUXER_TYPE_VIVO 8
#define DEMUXER_TYPE_TV 9
-#define DEMUXER_TYPE_FLI 10
#define DEMUXER_TYPE_REAL 11
-#define DEMUXER_TYPE_Y4M 12
-#define DEMUXER_TYPE_NUV 13
-#define DEMUXER_TYPE_FILM 14
-#define DEMUXER_TYPE_ROQ 15
#define DEMUXER_TYPE_MF 16
#define DEMUXER_TYPE_AUDIO 17
#define DEMUXER_TYPE_OGG 18
#define DEMUXER_TYPE_BMP 19
#define DEMUXER_TYPE_RAWAUDIO 20
#define DEMUXER_TYPE_RTP 21
-#define DEMUXER_TYPE_RAWDV 22
-#define DEMUXER_TYPE_PVA 23
-#define DEMUXER_TYPE_SMJPEG 24
#define DEMUXER_TYPE_XMMS 25
// This should always match the higest demuxer type number.
diff -aur MPlayer-0.90rc2.orig/libmpdemux/Makefile MPlayer-0.90rc2/libmpdemux/Makefile
--- MPlayer-0.90rc2.orig/libmpdemux/Makefile 2002-12-23 05:01:01.000000000 +0800
+++ MPlayer-0.90rc2/libmpdemux/Makefile 2008-09-06 21:57:20.000000000 +0800
@@ -3,7 +3,7 @@
include ../config.mak
-SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c aviwrite.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_pva.c demux_viv.c demuxer.c dvdauth.c dvdnav_stream.c open.c parse_es.c stream.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c demux_ogg.c demux_bmp.c cdda.c demux_rawaudio.c cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_oss.c audio_in.c demux_smjpeg.c
+SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c aviwrite.c demux_asf.c demux_avi.c parse_mp4.c demux_mpg.c demuxer.c dvdauth.c dvdnav_stream.c open.c parse_es.c stream.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c mf.c demux_mf.c demux_audio.c demux_demuxers.c demux_ogg.c demux_bmp.c cdda.c demux_rawaudio.c cddb.c cdinfo.c ai_alsa.c ai_oss.c audio_in.c
ifeq ($(XMMS_PLUGINS),yes)
SRCS += demux_xmms.c
endif
diff -aur MPlayer-0.90rc2.orig/libmpdemux/network.c MPlayer-0.90rc2/libmpdemux/network.c
--- MPlayer-0.90rc2.orig/libmpdemux/network.c 2002-11-06 03:03:52.000000000 +0800
+++ MPlayer-0.90rc2/libmpdemux/network.c 2008-09-06 21:57:20.000000000 +0800
@@ -56,8 +56,6 @@
{ "video/x-mpeg2", DEMUXER_TYPE_MPEG_PS },
// AVI ??? => video/x-msvideo
{ "video/x-msvideo", DEMUXER_TYPE_AVI },
- // MOV => video/quicktime
- { "video/quicktime", DEMUXER_TYPE_MOV },
// ASF
{ "audio/x-ms-wax", DEMUXER_TYPE_ASF },
{ "audio/x-ms-wma", DEMUXER_TYPE_ASF },
@@ -71,8 +69,6 @@
{ "audio/x-scpls", DEMUXER_TYPE_PLAYLIST },
{ "audio/x-mpegurl", DEMUXER_TYPE_PLAYLIST },
{ "audio/x-pls", DEMUXER_TYPE_PLAYLIST },
- // Real Media
- { "audio/x-pn-realaudio", DEMUXER_TYPE_REAL },
// OGG Streaming
{ "application/x-ogg", DEMUXER_TYPE_OGG }
@@ -92,10 +88,6 @@
{ "asf", DEMUXER_TYPE_ASF },
{ "wmv", DEMUXER_TYPE_ASF },
{ "wma", DEMUXER_TYPE_ASF },
- { "viv", DEMUXER_TYPE_VIVO },
- { "rm", DEMUXER_TYPE_REAL },
- { "ra", DEMUXER_TYPE_REAL },
- { "y4m", DEMUXER_TYPE_Y4M },
{ "mp3", DEMUXER_TYPE_AUDIO },
{ "ogg", DEMUXER_TYPE_OGG },
{ "wav", DEMUXER_TYPE_AUDIO },
@@ -867,13 +859,6 @@
case DEMUXER_TYPE_MPEG_ES:
case DEMUXER_TYPE_MPEG_PS:
case DEMUXER_TYPE_AVI:
- case DEMUXER_TYPE_MOV:
- case DEMUXER_TYPE_VIVO:
- case DEMUXER_TYPE_FLI:
- case DEMUXER_TYPE_REAL:
- case DEMUXER_TYPE_Y4M:
- case DEMUXER_TYPE_FILM:
- case DEMUXER_TYPE_ROQ:
case DEMUXER_TYPE_AUDIO:
case DEMUXER_TYPE_OGG:
case DEMUXER_TYPE_PLAYLIST:
diff -aur MPlayer-0.90rc2.orig/libmpdemux/video.c MPlayer-0.90rc2/libmpdemux/video.c
--- MPlayer-0.90rc2.orig/libmpdemux/video.c 2002-11-02 01:46:43.000000000 +0800
+++ MPlayer-0.90rc2/libmpdemux/video.c 2008-09-06 21:57:20.000000000 +0800
@@ -86,7 +86,6 @@
if (!demux_is_mpeg_rtp_stream(d_video->demuxer)) break;
// otherwise fall through to...
#endif
- case DEMUXER_TYPE_PVA:
case DEMUXER_TYPE_MPEG_ES:
case DEMUXER_TYPE_MPEG_PS: {
//mpeg_header_parser:
@@ -220,7 +219,6 @@
*start=NULL;
if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES || demuxer->file_format==DEMUXER_TYPE_MPEG_PS
- || demuxer->file_format==DEMUXER_TYPE_PVA
#ifdef STREAMING_LIVE_DOT_COM
|| (demuxer->file_format==DEMUXER_TYPE_RTP && demux_is_mpeg_rtp_stream(demuxer))
#endif
@@ -314,9 +312,6 @@
#ifdef USE_TV
case DEMUXER_TYPE_TV:
#endif
- case DEMUXER_TYPE_MOV:
- case DEMUXER_TYPE_FILM:
- case DEMUXER_TYPE_VIVO:
case DEMUXER_TYPE_ASF: {
float next_pts = ds_get_next_pts(d_video);
float d= next_pts > 0 ? next_pts - d_video->pts : d_video->pts-pts1;
diff -aur MPlayer-0.90rc2.orig/libvo/Makefile MPlayer-0.90rc2/libvo/Makefile
--- MPlayer-0.90rc2.orig/libvo/Makefile 2002-11-10 21:12:53.000000000 +0800
+++ MPlayer-0.90rc2/libvo/Makefile 2008-09-06 21:57:20.000000000 +0800
@@ -3,7 +3,7 @@
LIBNAME = libvo.a
-SRCS=geometry.c aspect.c aclib.c osd.c font_load.c gtf.c spuenc.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_mpegpes.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) sub.c font_load_ft.c
+SRCS=geometry.c aspect.c aclib.c osd.c font_load.c gtf.c spuenc.c video_out.c vo_null.c $(OPTIONAL_SRCS) sub.c font_load_ft.c
OBJS=$(SRCS:.c=.o)
ifeq ($(VIDIX),yes)
diff -aur MPlayer-0.90rc2.orig/libvo/video_out.c MPlayer-0.90rc2/libvo/video_out.c
--- MPlayer-0.90rc2.orig/libvo/video_out.c 2002-11-11 23:20:25.000000000 +0800
+++ MPlayer-0.90rc2/libvo/video_out.c 2008-09-06 21:57:20.000000000 +0800
@@ -64,16 +64,12 @@
//extern vo_functions_t video_out_odivx;
extern vo_functions_t video_out_zr;
extern vo_functions_t video_out_bl;
-extern vo_functions_t video_out_pgm;
-extern vo_functions_t video_out_md5;
extern vo_functions_t video_out_syncfb;
extern vo_functions_t video_out_fbdev;
extern vo_functions_t video_out_svga;
extern vo_functions_t video_out_png;
extern vo_functions_t video_out_ggi;
extern vo_functions_t video_out_aa;
-extern vo_functions_t video_out_mpegpes;
-extern vo_functions_t video_out_yuv4mpeg;
#ifdef HAVE_DIRECTX
extern vo_functions_t video_out_directx;
#endif
@@ -173,10 +169,6 @@
#endif
&video_out_null,
// &video_out_odivx,
- &video_out_pgm,
- &video_out_md5,
- &video_out_mpegpes,
- &video_out_yuv4mpeg,
#ifdef HAVE_VESA
&video_out_vesa,
#endif
diff -aur MPlayer-0.90rc2.orig/Makefile MPlayer-0.90rc2/Makefile
--- MPlayer-0.90rc2.orig/Makefile 2002-12-23 05:00:46.000000000 +0800
+++ MPlayer-0.90rc2/Makefile 2008-09-06 21:57:20.000000000 +0800
@@ -36,11 +36,11 @@
VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) $(GIF_LIB)
AO_LIBS = $(ARTS_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(XVID_LIB) $(DECORE_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB)
-COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a $(PP_LIB) postproc/libswscale.a linux/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB)
+COMMON_LIBS = libmpcodecs/libmpcodecs.a liba52/liba52.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a $(PP_LIB) postproc/libswscale.a linux/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB)
CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) # -Wall
-PARTS = libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libao2 drivers linux postproc input libvo libaf
+PARTS = libmpdemux libmpcodecs liba52 libavcodec libao2 drivers linux postproc input libvo libaf
ifeq ($(VIDIX),yes)
PARTS += libdha vidix
endif
@@ -72,7 +72,7 @@
ALL_PRG += $(PRG_FIBMAP)
endif
-COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a
+COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a linux/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a
ifeq (($SHARED_PP),yes)
COMMON_DEPS += postproc/libpostproc.so
else
@@ -138,9 +138,6 @@
libavcodec/libavcodec.a:
$(MAKE) -C libavcodec
-libmpeg2/libmpeg2.a:
- $(MAKE) -C libmpeg2
-
libvo/libvo.a:
$(MAKE) -C libvo
@@ -150,9 +147,6 @@
liba52/liba52.a:
$(MAKE) -C liba52
-mp3lib/libMP3.a:
- $(MAKE) -C mp3lib
-
libdha/libdha.so:
$(MAKE) -C libdha