summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DOCS/man/de/mplayer.118
-rw-r--r--DOCS/man/en/mplayer.151
-rw-r--r--cfg-mplayer.h7
-rw-r--r--command.c2
-rwxr-xr-xconfigure20
-rw-r--r--etc/codecs.conf316
-rw-r--r--libmpcodecs/ad_liba52.c6
-rw-r--r--libmpcodecs/ad_pcm.c2
-rw-r--r--libmpcodecs/ad_qtaudio.c4
-rw-r--r--libmpcodecs/ad_speex.c27
-rw-r--r--libmpcodecs/vd_ffmpeg.c11
-rw-r--r--libmpdemux/demux_ts.c2
-rw-r--r--libmpdemux/demuxer.c5
-rw-r--r--libmpdemux/mp_taglists.c9
-rw-r--r--libmpdemux/stheader.h2
-rw-r--r--libvo/vo_fbdev.c22
-rw-r--r--libvo/vo_fbdev2.c81
-rw-r--r--libvo/vo_gl.c2
-rw-r--r--mplayer.c38
-rw-r--r--options.h1
-rw-r--r--rpm/mplayer.spec2
-rw-r--r--stream/cache2.c20
-rw-r--r--stream/network.c7
-rw-r--r--stream/network.h2
-rw-r--r--stream/stream.c24
-rw-r--r--stream/stream_dvdnav.c7
-rw-r--r--stream/stream_ffmpeg.c1
-rw-r--r--stream/stream_file.c12
-rw-r--r--stream/stream_smb.c12
-rw-r--r--sub/spudec.c4
30 files changed, 518 insertions, 199 deletions
diff --git a/DOCS/man/de/mplayer.1 b/DOCS/man/de/mplayer.1
index de7bef45ca..120c6ce701 100644
--- a/DOCS/man/de/mplayer.1
+++ b/DOCS/man/de/mplayer.1
@@ -2408,6 +2408,24 @@ Deaktiviert das automatische Laden von Untertiteln.
Setzt die Anzeigedauer der OSD-Meldungen in ms (Standard: 1000).
.
.TP
+.B \-osd\-fractions <0\-2>
+Setzt die Art der Anzeige von Nachkommastellen des aktuellen Zeitstempels im
+OSD:
+.PD 0
+.RSs
+.IPs 0
+Keine Anzeige der Nachkommastellen (Standard).
+.IPs 1
+Zeige die ersten beiden Nachkommastellen.
+.IPs 2
+Zeige genäherte Framezahl an.
+Die angezeigte Framezahl ist nicht exakt, sondern nur genähert.
+Für variable FPS ist die Näherung weit von der tatsächlichen Framezahl
+entfernt.
+.RE
+.PD 1
+.
+.TP
.B \-osdlevel <0\-3> (nur bei MPlayer)
Gibt den Modus an, in dem das OSD startet:
.PD 0
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 0f3a2b2aa6..efd71a63c3 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -1474,6 +1474,35 @@ Can be slow especially when seeking backwards since it has to rewind
to the beginning to find an exact frame position.
.
.TP
+.B \-http-header-fields <field1,field2>
+Set custom HTTP fields when accessing HTTP stream.
+.sp 1
+.I EXAMPLE:
+.PD 0
+.RSs
+.IPs
+mplayer \-http\-header\-fields 'Field1: value1','Field2: value2' http://localhost:1234
+.br
+Will generate HTTP request:
+.RSss
+.br
+GET / HTTP/1.0
+.br
+Host: localhost:1234
+.br
+User-Agent: MPlayer
+.br
+Icy-MetaData: 1
+.br
+Field1: value1
+.br
+Field2: value2
+.br
+Connection: close
+.REss
+.RE
+.
+.TP
.B \-idx (also see \-forceidx)
Rebuilds index of files if no index was found, allowing seeking.
Useful with broken/\:incomplete downloads, or badly created files.
@@ -2324,6 +2353,23 @@ Turns off automatic subtitle file loading.
Set the duration of the OSD messages in ms (default: 1000).
.
.TP
+.B \-osd\-fractions <0\-2>
+Set how fractions of seconds of the current timestamp are printed on the OSD:
+.PD 0
+.RSs
+.IPs 0
+Do not display fractions (default).
+.IPs 1
+Show the first two decimals.
+.IPs 2
+Show approximate frame count within current second.
+This frame count is not accurate but only an approximation.
+For variable fps, the approximation is known to be far off the correct frame
+count.
+.RE
+.PD 1
+.
+.TP
.B \-osdlevel <0\-3>
Specifies which mode the OSD should start in.
.PD 0
@@ -3110,6 +3156,11 @@ Fixes fullscreen switching on OpenBox 1.x.
.PD 1
.
.TP
+.B \-gamma <\-100\-100>
+Adjust the gamma of the video signal (default: 0).
+Not supported by all video output drivers.
+.
+.TP
.B \-geometry x[%][:y[%]] or [WxH][+-x+-y]
Adjust where the output is on the screen initially.
The x and y specifications are in pixels measured from the top-left of the
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index a4dd498b94..0ada04916a 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -442,6 +442,7 @@ const m_option_t common_opts[] = {
{"user", &network_username, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"passwd", &network_password, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"bandwidth", &network_bandwidth, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
+ {"http-header-fields", &network_http_header_fields, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
{"user-agent", &network_useragent, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"referrer", &network_referrer, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"cookies", &network_cookies_enabled, CONF_TYPE_FLAG, 0, 0, 1, NULL},
@@ -868,6 +869,7 @@ const m_option_t mplayer_opts[]={
OPT_INTRANGE("saturation", vo_gamma_saturation, 0, -100, 100),
OPT_INTRANGE("contrast", vo_gamma_contrast, 0, -100, 100),
OPT_INTRANGE("hue", vo_gamma_hue, 0, -100, 100),
+ OPT_INTRANGE("gamma", vo_gamma_gamma, 0, -100, 100),
{"keepaspect", &vo_keepaspect, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"nokeepaspect", &vo_keepaspect, CONF_TYPE_FLAG, 0, 1, 0, NULL},
@@ -895,6 +897,7 @@ const m_option_t mplayer_opts[]={
#endif
OPT_INTRANGE("osdlevel", osd_level, 0, 0, 3),
OPT_INTRANGE("osd-duration", osd_duration, 0, 0, 3600000),
+ OPT_INTRANGE("osd-fractions", osd_fractions, 0, 0, 2),
#ifdef CONFIG_MENU
{"menu", &use_menu, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
{"nomenu", &use_menu, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
@@ -955,7 +958,9 @@ const m_option_t mplayer_opts[]={
OPT_FLAG_CONSTANTS("noloop", loop_times, 0, 0, -1),
OPT_INTRANGE("loop", loop_times, 0, -1, 10000),
- {"playlist", NULL, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ {"playlist", NULL, CONF_TYPE_STRING, CONF_NOCFG, 0, 0, NULL},
+ {"shuffle", NULL, CONF_TYPE_FLAG, CONF_NOCFG, 0, 0, NULL},
+ {"noshuffle", NULL, CONF_TYPE_FLAG, CONF_NOCFG, 0, 0, NULL},
OPT_MAKE_FLAGS("ordered-chapters", ordered_chapters, 0),
OPT_INTRANGE("chapter-merge-threshold", chapter_merge_threshold, 0, 0, 10000),
diff --git a/command.c b/command.c
index 5b9bf82af2..de7f1fbca9 100644
--- a/command.c
+++ b/command.c
@@ -605,6 +605,8 @@ static int mp_property_angle(m_option_t *prop, int action, void *arg,
angle += step;
if (angle < 1) //cycle
angle = angles;
+ else if (angle > angles)
+ angle = 1;
break;
}
default:
diff --git a/configure b/configure
index 53b58f348b..749c400206 100755
--- a/configure
+++ b/configure
@@ -296,7 +296,6 @@ Installation directories:
Optional features:
--disable-mplayer disable MPlayer compilation [enable]
- --disable-largefiles disable support for files > 2GB [enable]
--enable-termcap use termcap database for key codes [autodetect]
--enable-termios use termios database for key codes [autodetect]
--disable-iconv disable iconv for encoding conversion [autodetect]
@@ -670,7 +669,6 @@ _xvr100=auto
_tga=yes
_directfb=auto
_bl=no
-_largefiles=yes
#language=en
_shm=auto
_translation=no
@@ -1076,8 +1074,6 @@ for ac_option do
--disable-bl) _bl=no ;;
--enable-mtrr) _mtrr=yes ;;
--disable-mtrr) _mtrr=no ;;
- --enable-largefiles) _largefiles=yes ;;
- --disable-largefiles) _largefiles=no ;;
--enable-shm) _shm=yes ;;
--disable-shm) _shm=no ;;
--enable-select) _select=yes ;;
@@ -2615,7 +2611,7 @@ if arm ; then
_armv6t2=no
inline_asm_check '"movt r0, #0"' && _armv6t2=yes
fi
- echores "$_armv6"
+ echores "$_armv6t2"
echocheck "ARM VFP"
if test $_armvfp = "auto" ; then
@@ -5284,11 +5280,9 @@ fi
if test "$_dvdread_internal" = yes; then
def_dvdread='#define CONFIG_DVDREAD 1'
inputmodules="dvdread(internal) $inputmodules"
- _largefiles=yes
res_comment="internal"
elif test "$_dvdread" = yes; then
def_dvdread='#define CONFIG_DVDREAD 1'
- _largefiles=yes
extra_ldflags="$extra_ldflags -ldvdread"
inputmodules="dvdread(external) $inputmodules"
res_comment="external"
@@ -5324,7 +5318,6 @@ if test "$_libdvdcss_internal" = yes ; then
cflags_libdvdcss_dvdread="-Ilibdvdcss"
def_dvdcss="#define HAVE_DVDCSS_DVDCSS_H 1"
inputmodules="libdvdcss(internal) $inputmodules"
- _largefiles=yes
else
noinputmodules="libdvdcss(internal) $noinputmodules"
fi
@@ -6600,14 +6593,8 @@ if os2 ; then
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 || test "$_libdvdcss_internal" = yes ; then
- # dvdread support requires this (for off64_t)
- CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
- fi
-fi
+
+CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS"
@@ -6637,7 +6624,6 @@ if test "$_dvdnav" = auto ; then
statement_check_broken stdint.h dvdnav/dvdnav.h 'dvdnav_t *dvd = 0' $_dvdnavdir $_dvdnavlibs $_ld_dl $_ld_pthread && _dvdnav=yes
fi
if test "$_dvdnav" = yes ; then
- _largefiles=yes
def_dvdnav='#define CONFIG_DVDNAV 1'
if test "$dvdnav_internal" = yes ; then
cflags_libdvdnav="-Ilibdvdnav"
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 3f624e51ee..8e37041599 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3,12 +3,20 @@
; Before editing this file, please read DOCS/tech/codecs.conf.txt !
;=============================================================================
-release 20101127
+release 20110311
;=============================================================================
; VIDEO CODECS
;=============================================================================
+videocodec ffanm
+ info "FFmpeg Deluxe Paint Animation"
+ status working
+ fourcc "ANM " ; internal MPlayer FourCC
+ driver ffmpeg
+ dll anm
+ out BGR8
+
videocodec ffbinkvideo
info "FFmpeg Bink Video"
status working
@@ -184,15 +192,13 @@ videocodec ffmpeg2
format 0x10000002 ; MPEG-2
fourcc mpg2,MPG2
fourcc "DVR "
- fourcc hdv1
- fourcc hdv2
fourcc MPEG
- fourcc hdv3 ; HDV 1080i50
- fourcc hdv5 ; HDV 720p25
fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s)
fourcc MMES,mmes ; matrox mpeg2 in avi
fourcc M701 ; matrox mpeg2 intra-only
- fourcc hdv6,hdv7,hdv8
+ fourcc hdv1,hdv2,hdv3
+ fourcc hdv4,hdv5,hdv6
+ fourcc hdv7,hdv8,hdv9
fourcc xdv1,xdv2,xdv3
fourcc xdv4,xdv5,xdv6
fourcc xdv7,xdv8,xdv9
@@ -200,7 +206,7 @@ videocodec ffmpeg2
fourcc xdvd,xdve,xdvf
fourcc xd5a,xd5b,xd5c
fourcc xd5d,xd5e,xd5f
- fourcc xd59,xd54
+ fourcc xd59,xd54,xd55
fourcc mx5n,mx4n,mx4p
fourcc mx3n,mx3p
fourcc AVmp
@@ -226,15 +232,13 @@ videocodec ffmpeg12
fourcc PIM2 ; Pinnacle hardware-MPEG-2
fourcc VCR2
fourcc "DVR "
- fourcc hdv2
fourcc MPEG
- fourcc hdv1
- fourcc hdv3 ; HDV 1080i50
- fourcc hdv5 ; HDV 720p25
fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s)
fourcc MMES,mmes ; matrox mpeg2 in avi
fourcc M701 ; matrox mpeg2 intra-only
- fourcc hdv6,hdv7,hdv8
+ fourcc hdv1,hdv2,hdv3
+ fourcc hdv4,hdv5,hdv6
+ fourcc hdv7,hdv8,hdv9
fourcc xdv1,xdv2,xdv3
fourcc xdv4,xdv5,xdv6
fourcc xdv7,xdv8,xdv9
@@ -242,7 +246,7 @@ videocodec ffmpeg12
fourcc xdvd,xdve,xdvf
fourcc xd5a,xd5b,xd5c
fourcc xd5d,xd5e,xd5f
- fourcc xd59,xd54
+ fourcc xd59,xd54,xd55
fourcc mx5n,mx4n,mx4p
fourcc mx3n,mx3p
fourcc AVmp
@@ -250,6 +254,7 @@ videocodec ffmpeg12
fourcc m2v1,m1v1
fourcc LMP2 ; Lead mpeg2 in avi
fourcc slif ; SoftLab MPEG-2 I-frames Codec
+ fourcc EM2V ; Etymonix MPEG-2 I-frame Video Codec
driver ffmpeg
dll "mpegvideo"
out YV12,I420,IYUV
@@ -262,17 +267,15 @@ videocodec ffmpeg12mc
format 0x10000002 ; MPEG-2
fourcc mpg1,mpg2,MPG2
fourcc "DVR "
- fourcc hdv1
- fourcc hdv2
fourcc PIM1 ; Pinnacle hardware-MPEG-1
fourcc PIM2 ; Pinnacle hardware-MPEG-2
fourcc VCR2
fourcc MPEG
- fourcc hdv3 ; HDV 1080i50
- fourcc hdv5 ; HDV 720p25
fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s)
fourcc MMES,mmes ; matrox mpeg2 in avi
- fourcc hdv6,hdv7,hdv8
+ fourcc hdv1,hdv2,hdv3
+ fourcc hdv4,hdv5,hdv6
+ fourcc hdv7,hdv8,hdv9
fourcc xdv1,xdv2,xdv3
fourcc xdv4,xdv5,xdv6
fourcc xdv7,xdv8,xdv9
@@ -280,7 +283,7 @@ videocodec ffmpeg12mc
fourcc xdvd,xdve,xdvf
fourcc xd5a,xd5b,xd5c
fourcc xd5d,xd5e,xd5f
- fourcc xd59,xd54
+ fourcc xd59,xd54,xd55
fourcc mx5n,mx4n,mx4p
fourcc mx3n,mx3p
fourcc AVmp
@@ -313,9 +316,6 @@ videocodec ffmpeg12vdpau
fourcc xdv7,xdv8,xdv9
fourcc xdva,xdvb,xdvc
fourcc xdvd,xdve,xdvf
- fourcc xd5a,xd5b,xd5c
- fourcc xd5d,xd5e,xd5f
- fourcc xd59,xd54
fourcc mx5n,mx4n,mx4p
fourcc mx3n,mx3p
fourcc AVmp
@@ -327,6 +327,40 @@ videocodec ffmpeg12vdpau
out VDPAU_MPEG1
out VDPAU_MPEG2
+videocodec ffmpeg2crystalhd
+ info "FFmpeg MPEG-2 (CrystalHD)"
+ status working
+ format 0x10000002 ; MPEG-2
+ fourcc mpg2,MPG2
+ fourcc "DVR "
+ fourcc MPEG
+ fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s)
+ fourcc MMES,mmes ; matrox mpeg2 in avi
+ fourcc M701 ; matrox mpeg2 intra-only
+ fourcc hdv1,hdv2,hdv3
+ fourcc hdv4,hdv5,hdv6
+ fourcc hdv7,hdv8,hdv9
+ fourcc xdv1,xdv2,xdv3
+ fourcc xdv4,xdv5,xdv6
+ fourcc xdv7,xdv8,xdv9
+ fourcc xdva,xdvb,xdvc
+ fourcc xdvd,xdve,xdvf
+ fourcc xd5a,xd5b,xd5c
+ fourcc xd5d,xd5e,xd5f
+ fourcc xd59,xd54
+ fourcc mx5n,mx4n,mx4p
+ fourcc mx3n,mx3p
+ fourcc AVmp
+ fourcc VCR2
+ fourcc mp2v,mpgv
+ fourcc m2v1
+ fourcc PIM2
+ fourcc LMP2 ; Lead mpeg2 in avi
+ fourcc slif ; SoftLab MPEG-2 I-frames Codec
+ driver ffmpeg
+ dll mpeg2_crystalhd
+ out YUY2
+
videocodec mpegpes
info "MPEG-PES output (.mpg or DXR3/IVTV/DVB/V4L2 card)"
comment "for hardware decoding"
@@ -336,8 +370,8 @@ videocodec mpegpes
fourcc mpg1,MPG1,mpg2,MPG2
fourcc MPEG
fourcc hdv1,hdv2,hdv3
- fourcc hdv5
- fourcc hdv6,hdv7,hdv8
+ fourcc hdv4,hdv5,hdv6
+ fourcc hdv7,hdv8,hdv9
fourcc xdv1,xdv2,xdv3
fourcc xdv4,xdv5,xdv6
fourcc xdv7,xdv8,xdv9
@@ -345,7 +379,7 @@ videocodec mpegpes
fourcc xdvd,xdve,xdvf
fourcc xd5a,xd5b,xd5c
fourcc xd5d,xd5e,xd5f
- fourcc xd59,xd54
+ fourcc xd59,xd54,xd55
fourcc mx5n,mx4n,mx4p
fourcc mx3n,mx3p
fourcc AVmp
@@ -861,6 +895,23 @@ videocodec ffdivx
dll msmpeg4
out YV12,I420,IYUV
+videocodec ffdivxcrystalhd
+ info "FFmpeg DivX ;-) (MSMPEG-4 v3) (CrystalHD)"
+ status buggy
+ fourcc MPG3,mpg3 div3
+ fourcc MP43,mp43 div3 ; MSMPEG-4 v3 (fourcc mapping to div3)
+ fourcc DIV5,div5 div3 ; DivX 3.20
+ fourcc DIV6,div6 div4 ; -||-
+ fourcc DIV3,div3,DIV4,div4
+ fourcc DIVF,divf ; divx4.12
+ fourcc AP41 div3 ; AngelPotion stuff
+ fourcc COL1,col1,COL0,col0 ; Cool codec (based on mpg4ds32.ax)
+ fourcc 3IVD,3ivd ; divxdoctored files (3ivx.com)
+ fourcc DVX3
+ driver ffmpeg
+ dll msmpeg4_crystalhd
+ out YUY2
+
videocodec ffmp42
info "FFmpeg MSMPEG-4 v2"
status working
@@ -921,6 +972,14 @@ videocodec ffwmv3vdpau
dll wmv3_vdpau
out VDPAU_WMV3
+videocodec ffwmv3crystalhd
+ info "FFmpeg WMV3/WMV9 (CrystalHD)"
+ status buggy
+ fourcc WMV3,wmv3
+ driver ffmpeg
+ dll wmv3_crystalhd
+ out YUY2
+
videocodec ffvc1
info "FFmpeg WVC1"
status buggy
@@ -939,6 +998,15 @@ videocodec ffvc1vdpau
dll vc1_vdpau
out VDPAU_VC1
+videocodec ffvc1crystalhd
+ info "FFmpeg WVC1 (CrystalHD)"
+ status buggy
+ fourcc WVC1,wvc1,WMVA
+ fourcc vc-1,VC-1
+ driver ffmpeg
+ dll vc1_crystalhd
+ out YUY2
+
videocodec ffh264
info "FFmpeg H.264"
status working
@@ -948,6 +1016,8 @@ videocodec ffh264
fourcc davc,DAVC
fourcc vvvc ; only one sample using this fourcc
fourcc ai55,ai15 ; flip4mac avc intra
+ fourcc ai1q,ai5q ; flip4mac avc intra
+ fourcc ai12 ;AVC Intra 100 / 1080
format 0x10000005
driver ffmpeg
dll h264
@@ -961,11 +1031,27 @@ videocodec ffh264vdpau
fourcc avc1,AVC1
fourcc davc,DAVC
fourcc ai55,ai15 ; flip4mac avc intra
+ fourcc ai1q,ai5q ; flip4mac avc intra
format 0x10000005
driver ffmpeg
dll h264_vdpau
out VDPAU_H264
+videocodec ffh264crystalhd
+ info "FFmpeg H.264 (CrystalHD)"
+ status working
+ fourcc H264,h264
+ fourcc X264,x264
+ fourcc avc1,AVC1
+ fourcc davc,DAVC
+ fourcc vvvc ; only one sample using this fourcc
+ fourcc ai55,ai15 ; flip4mac avc intra
+ fourcc ai1q,ai5q ; flip4mac avc intra
+ format 0x10000005
+ driver ffmpeg
+ dll h264_crystalhd
+ out YUY2
+
videocodec coreavcwindows
info "CoreAVC H.264 for x86 - http://corecodec.org/"
comment "this codec will only work after purchasing it"
@@ -976,6 +1062,7 @@ videocodec coreavcwindows
fourcc davc,DAVC
fourcc VSSH
fourcc ai55,ai15 ; flip4mac avc intra
+ fourcc ai1q,ai5q ; flip4mac avc intra
format 0x10000005
driver dshow
dll "CoreAVCDecoder.ax"
@@ -1057,6 +1144,39 @@ videocodec ffodivxvdpau
dll mpeg4_vdpau
out VDPAU_MPEG4
+videocodec ffodivxcrystalhd
+ info "FFmpeg MPEG-4,DIVX-4/5 (CrystalHD)"
+ status working
+ fourcc FMP4,fmp4
+ fourcc DIVX,divx
+ fourcc DIV1,div1 divx
+ fourcc MP4S,mp4s ; ISO MPEG-4 Video V1
+ fourcc M4S2,m4s2
+ fourcc xvid,XVID,XviD,XVIX
+ fourcc DX50,dx50,BLZ0 DX50
+ fourcc mp4v,MP4V
+ format 0x4
+ fourcc UMP4
+ fourcc RMP4
+ fourcc 3IV2,3iv2 ; 3ivx Delta 4
+ fourcc DXGM
+ fourcc SEDG ; diskless camcorder Samsung Miniket VP-M110
+ fourcc SMP4,smp4 ; Samsung SMP4 video codec
+ fourcc VIDM ; vidm 4.01 codec
+ format 0x10000004 ; mpeg 4 es
+ fourcc m4cc,M4CC
+ fourcc hdx4,HDX4
+ fourcc FVFW,fvfw
+ fourcc FFDS
+ fourcc DCOD,MVXM,EM4A,PM4V
+ fourcc M4T3,DMK2,DIGI,INMC
+ fourcc EPHV,SN40,WAWV
+ fourcc uldx,ULDX,VSPX
+ fourcc SIPP ; Samsung SHR-6040
+ driver ffmpeg
+ dll mpeg4_crystalhd
+ out YUY2
+
videocodec ffwv1f
info "WV1F MPEG-4"
status working
@@ -1742,6 +1862,7 @@ videocodec ffdv
status working
fourcc CDVC,cdvc
fourcc CDVH,cdvh ; Canopus DVCPRO HD
+ fourcc CDV5 ; Canopus SD50
fourcc DVSD,dvsd ; PAL
fourcc DVCS,dvcs ; NTSC ?
fourcc "dvcp" ; PAL DV in .mov
@@ -2494,6 +2615,14 @@ videocodec webtrain
dll "wtvc.dll"
out BGR16 flip
+videocodec ffkega
+ info "FFmpeg Kega Video"
+ status working
+ fourcc KGV1
+ driver ffmpeg
+ dll kgv1
+ out BGR15
+
videocodec kegavideo
info "Kega Video"
comment "requires MSVCR80.DLL on windows"
@@ -3008,6 +3137,14 @@ videocodec fffraps
dll "fraps"
out BGR24,YV12,I420
+videocodec ffjv
+ info "FFmpeg Bitmap Brothers JV"
+ status working
+ fourcc FFJV ; internal MPlayer FourCC
+ driver ffmpeg
+ dll "jv"
+ out BGR8
+
videocodec fftiertexseq
info "FFmpeg Tiertex SEQ"
status working
@@ -3554,45 +3691,45 @@ audiocodec wma9spdshow
audiocodec ffqdm2
info "FFmpeg QDM2 audio"
status working
- format 0x324D4451 ; "QDM2"
+ fourcc QDM2
driver ffmpeg
dll "qdm2"
audiocodec qdmc
info "QuickTime QDMC/QDM2 audio"
status working
- format 0x324D4451 ; "QDM2"
- format 0x434D4451 ; "QDMC"
+ fourcc QDM2
+ fourcc QDMC
driver qtaudio
dll "QuickTime.qts"
audiocodec ffqclp
info "FFmpeg QCLP audio"
status working
- format 0x706C6351 ; "Qclp"
- format 0x70637173 ; "sqcp"
- format 0x716C6351 ; "Qclq"
+ fourcc Qclp
+ fourcc sqcp
+ fourcc Qclq
driver ffmpeg
dll "qcelp"
audiocodec qclp
info "QuickTime QCLP audio"
status working
- format 0x706C6351 ; "Qclp"
+ fourcc Qclp
driver qtaudio
dll "QuickTime.qts"
audiocodec qtmace3
info "QuickTime MACE3 audio"
status working
- format 0x3343414D ; "MAC3"
+ fourcc MAC3
driver qtaudio
dll "QuickTime.qts"
audiocodec qtmace6
info "QuickTime MACE6 audio"
status working
- format 0x3643414D ; "MAC6"
+ fourcc MAC6
driver qtaudio
dll "QuickTime.qts"
@@ -3606,29 +3743,29 @@ audiocodec zygoaudio
audiocodec ffra144
info "FFmpeg RealAudio 1.0"
status working
- format 0x345F3431 ; "14_4"
- format 0x4A63706C ; "lpcJ"
+ fourcc 14_4
+ fourcc lpcJ
driver ffmpeg
dll "real_144"
audiocodec ffra288
info "FFmpeg RealAudio 2.0"
status working
- format 0x385F3832 ; "28_8"
+ fourcc 28_8
driver ffmpeg
dll "real_288"
audiocodec ffcook
info "FFmpeg COOK audio"
status working
- format 0x6B6F6F63 ; "cook"
+ fourcc cook
driver ffmpeg
dll "cook"
audiocodec ffatrc
info "FFmpeg Atrac 3 audio"
status working
- format 0x63727461 ; "atrc"
+ fourcc atrc
format 0x270 ; atrac3 in wav
driver ffmpeg
dll "atrac3"
@@ -3636,7 +3773,7 @@ audiocodec ffatrc
audiocodec ffsipr
info "FFmpeg Sipr/Acelp.net audio"
status working
- format 0x72706973 ; "sipr"
+ fourcc sipr
format 0x130 ; acelp.net
driver ffmpeg
dll "sipr"
@@ -3644,42 +3781,42 @@ audiocodec ffsipr
audiocodec ra144
info "RealAudio 1.0"
status working
- format 0x345F3431 ; "14_4"
+ fourcc 14_4
driver realaud
dll "14_4.so.6.0"
audiocodec ra144win
info "Win32 RealAudio 1.0"
status working
- format 0x345F3431 ; "14_4"
+ fourcc 14_4
driver realaud
dll "14_43260.dll"
audiocodec ra144mac
info "Mac OS X RealAudio 1.0"
status working
- format 0x345F3431 ; "14_4"
+ fourcc 14_4
driver realaud
dll "14_4.shlb"
audiocodec ra288
info "RealAudio 2.0"
status working
- format 0x385F3832 ; "28_8"
+ fourcc 28_8
driver realaud
dll "28_8.so.6.0"
audiocodec ra288win
info "Win32 RealAudio 2.0"
status working
- format 0x385F3832 ; "28_8"
+ fourcc 28_8
driver realaud
dll "28_83260.dll"
audiocodec ra288mac
info "Mac OS X RealAudio 2.0"
status working
- format 0x385F3832 ; "28_8"
+ fourcc 28_8
driver realaud
dll "28_8.shlb"
@@ -3687,14 +3824,14 @@ audiocodec ra10cook
info "RealPlayer 10 COOK audio"
comment "supports cook 5.1"
status working
- format 0x6B6F6F63 ; "cook"
+ fourcc cook
driver realaud
dll "cook.so"
audiocodec racook
info "RealAudio COOK"
status working
- format 0x6B6F6F63 ; "cook"
+ fourcc cook
driver realaud
dll "cook.so.6.0"
@@ -3702,91 +3839,91 @@ audiocodec ra10cookwin
info "Win32 RealAudio 10 COOK"
comment "supports cook 5.1"
status working
- format 0x6B6F6F63 ; "cook"
+ fourcc cook
driver realaud
dll "cook.dll"
audiocodec racookwin
info "Win32 RealAudio COOK"
status working
- format 0x6B6F6F63 ; "cook"
+ fourcc cook
driver realaud
dll "cook3260.dll"
audiocodec racookmac
info "Mac OS X RealAudio COOK"
status working
- format 0x6B6F6F63 ; "cook"
+ fourcc cook
driver realaud
dll "cook.bundle/Contents/MacOS/cook"
audiocodec rasipr
info "RealAudio Sipro"
status working
- format 0x72706973 ; "sipr"
+ fourcc sipr
driver realaud
dll "sipr.so.6.0"
audiocodec ra10sipr
info "RealPlayer 10 RealAudio Sipro"
status working
- format 0x72706973 ; "sipr"
+ fourcc sipr
driver realaud
dll "sipr.so"
audiocodec ra10siprwin
info "Win32 RealAudio 10 Sipro"
status working
- format 0x72706973 ; "sipr"
+ fourcc sipr
driver realaud
dll "sipr.dll"
audiocodec rasiprwin
info "Win32 RealAudio Sipro"
status working
- format 0x72706973 ; "sipr"
+ fourcc sipr
driver realaud
dll "sipr3260.dll"
audiocodec rasiprmac
info "Mac OS X RealAudio Sipro"
status working
- format 0x72706973 ; "sipr"
+ fourcc sipr
driver realaud
dll "sipr.bundle/Contents/MacOS/sipr"
audiocodec raatrc
info "RealAudio ATRAC3"
status working
- format 0x63727461 ; "atrc"
+ fourcc atrc
driver realaud
dll "atrc.so.6.0"
audiocodec ra10atrc
info "RealPlayer 10 RealAudio ATRAC3"
status working
- format 0x63727461 ; "atrc"
+ fourcc atrc
driver realaud
dll "atrc.so"
audiocodec ra10atrcwin
info "Win32 RealAudio 10 ATRAC3"
status working
- format 0x63727461 ; "atrc"
+ fourcc atrc
driver realaud
dll "atrc.dll"
audiocodec raatrcwin
info "Win32 RealAudio ATRAC3"
status working
- format 0x63727461 ; "atrc"
+ fourcc atrc
driver realaud
dll "atrc3260.dll"
audiocodec raatrcmac
info "Mac OS X RealAudio ATRAC3"
status working
- format 0x63727461 ; "atrc"
+ fourcc atrc
driver realaud
dll "atrc.bundle/Contents/MacOS/atrc"
@@ -3807,7 +3944,7 @@ audiocodec ffadpcmimaamv
audiocodec ffadpcmimaqt
info "FFmpeg QT IMA ADPCM audio"
status working
- format 0x34616d69 ; "ima4" (MOV files)
+ fourcc ima4 ; (MOV files)
driver ffmpeg
dll adpcm_ima_qt
@@ -3824,7 +3961,7 @@ audiocodec imaadpcm
info "IMA ADPCM"
status working
format 0x11
- format 0x34616d69 ; "ima4" (MOV files)
+ fourcc ima4 ; (MOV files)
format 0x1100736d ; "ms\x00\x11" (MOV files)
driver imaadpcm
@@ -3959,9 +4096,10 @@ audiocodec ffadpcmxa
audiocodec ffxandpcm
info "FFmpeg XAN DPCM audio"
- comment "only works with libavformat demuxer"
+ comment "Wing Commander 4 files only work with libavformat demuxer"
status working
fourcc Axan
+ format 0x594A
driver ffmpeg
dll xan_dpcm
@@ -4119,18 +4257,20 @@ audiocodec pcm
format 0x1
format 0x3 ; IEEE float
format 0xfffe ; Extended
- format 0x20776172 ; "raw " (MOV files)
- format 0x736f7774 ; "twos" (MOV files)
- format 0x74776f73 ; "sowt" (MOV files)
- format 0x32336c66 ; "fl32" (MOV files)
- format 0x666c3332 ; "23lf" (MOV files)
-; format 0x34366c66 ; "fl64" (MOV files)
-; format 0x666c3634 ; "46lf" (MOV files)
- format 0x454e4f4e ; "NONE" (MOV files from Kodak CX6320)
- format 0x34326e69 ; "in24" (MOV files)
- format 0x696e3234 ; "42ni" (MOV files)
- format 0x32336e69 ; "in32" (MOV files)
- format 0x696e3332 ; "23ni" (MOV files)
+ fourcc "raw " ; (MOV files)
+ fourcc twos ; (MOV files)
+ fourcc sowt ; (MOV files)
+ fourcc fl32 ; (MOV files)
+ fourcc 23lf ; (MOV files)
+; fourcc fl64 ; (MOV files)
+; fourcc 46lf ; (MOV files)
+ fourcc NONE ; (MOV files from Kodak CX6320)
+ fourcc in24 ; (MOV files)
+ fourcc 42ni ; (MOV files)
+ fourcc in32 ; (MOV files)
+ fourcc 23ni ; (MOV files)
+ fourcc lpcm ; (MOV files)
+ fourcc FL32 ; (aiff files)
;;;; these are for hardware support only: (alaw,ulaw,ima-adpcm,mpeg,ac3)
; format 0x6
; format 0x7
@@ -4347,7 +4487,7 @@ audiocodec imaadpcmacm
audiocodec ffgsm
info "FFmpeg GSM 06.10"
status working
- format 0x204D5347
+ fourcc "GSM "
format 0x1500
fourcc agsm
driver ffmpeg
@@ -4364,7 +4504,7 @@ audiocodec ffgsmms
audiocodec libgsm
info "libgsm GSM 06.10"
status working
- format 0x204D5347
+ fourcc "GSM "
format 0x1500
driver ffmpeg
dll "libgsm"
@@ -4397,14 +4537,14 @@ audiocodec alaw
info "aLaw"
status working
format 0x6
- format 0x77616C61 ; 'alaw', .mov files<