diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-16 06:54:22 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-16 07:01:46 +0200 |
commit | 287b62163eed8811b6cd33716c0691d328947d48 (patch) | |
tree | 3143d2cb17b32a19e3e7e0aa428210d1bba3eb0b /etc | |
parent | 507f4fe6c7811558b1367e4b64855ae7f9bc8da8 (diff) | |
parent | b411278fbb00767b8013604157a43e0203f66f4c (diff) | |
download | mpv-287b62163eed8811b6cd33716c0691d328947d48.tar.bz2 mpv-287b62163eed8811b6cd33716c0691d328947d48.tar.xz |
Merge svn changes up to r29912
Diffstat (limited to 'etc')
-rw-r--r-- | etc/codecs.conf | 38 | ||||
-rw-r--r-- | etc/example.conf | 3 | ||||
-rw-r--r-- | etc/menu.conf | 2 |
3 files changed, 42 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 68d47e6dea..ac3dc06aca 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1263,6 +1263,8 @@ videocodec ffmjpeg fourcc MMJP,QIVG fourcc ACDV ; ACDSee jpeg fourcc SLMJ ; SL M-JPEG + fourcc MVJP ; Midvid JPEG Video Codec + fourcc IJLV ; Intel JPEG Library Video Codec driver ffmpeg dll mjpeg out 444P @@ -1409,6 +1411,14 @@ videocodec pegasusmwv dll "pvwv220.dll" out BGR24 flip +videocodec fffrwu + info "FFmpeg Forward Uncompressed Video Codec" + status working + fourcc FRWU + driver ffmpeg + dll "FRWU" + out UYVY + videocodec frwuvfw info "Forward Uncompressed Video Codec" status working @@ -2118,6 +2128,14 @@ videocodec vcr2 out YV12 out BGR24 +videocodec slifvfw + info "SoftLab-NSK Forward MPEG2 I-frames" + status working + fourcc slif + driver vfw + dll "slif.dll" + out RGB32 flip + videocodec cjpg info "Creative Labs Video Blaster Webcam" comment "sequential jpeg files?" @@ -2847,6 +2865,13 @@ videocodec ffc93 dll c93 out BGR8 +videocodec eatgv + info "FFmpeg Electronic Arts TGV" + status working + fourcc fVGT + driver ffmpeg + dll eatgv + out BGR8 ; raw formats: (now RGB formats are autodetected) @@ -2978,6 +3003,10 @@ videocodec rawyuy2 format 0x0 0x32595559 format 0x20776172 0x32595559 fourcc yuy2,YUY2 + fourcc V422 YUY2 + fourcc YUNV YUY2 + fourcc VYUY YUY2 + fourcc yuvs YUY2 out YUY2 videocodec rawyuv2 @@ -2997,6 +3026,11 @@ videocodec rawuyvy format 0x79757632 0x59565955 # 2vuy as created by QuickTime captures format 0x20776172 0x59565955 fourcc uyvy,UYVY + fourcc HDYC UYVY + fourcc UYNV UYVY + fourcc UYNY UYVY + fourcc uyv1 UYVY + fourcc 2Vu1 UYVY out UYVY videocodec raw444P @@ -3015,6 +3049,8 @@ videocodec raw422P format 0x0 0x50323234 format 0x20776172 0x50323234 fourcc 422p,422P + fourcc P422 422P + fourcc Y42B 422P out 422P videocodec rawyv12 @@ -3703,6 +3739,7 @@ audiocodec mp3 format 0x55 ; layer-3 format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files) format 0x5000736d ; "ms\0\x50" older mp2 fcc (MOV files) + format 0x55005354 ; broken file fourcc ".mp3" ; CBR/VBR MP3 (MOV files) fourcc "MP3 " ; used in .nsv files fourcc "LAME" ; used in mythtv .nuv files @@ -3772,6 +3809,7 @@ audiocodec ffmp3 status working format 0x55 format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files) + format 0x55005354 ; broken file fourcc ".mp3" ; CBR/VBR MP3 (MOV files) fourcc "MP3 " ; used in .nsv files fourcc "LAME" ; used in mythtv .nuv files diff --git a/etc/example.conf b/etc/example.conf index cb3e29030e..5f94437db9 100644 --- a/etc/example.conf +++ b/etc/example.conf @@ -125,7 +125,10 @@ ################### # DVDNAV Settings # ################### +[protocol.dvdnav] #vc=ffmpeg12, +#mouse-movements=yes +#nocache=yes # You can also include other configuration files. #include = /path/to/the/file/you/want/to/include diff --git a/etc/menu.conf b/etc/menu.conf index 90a19923ce..635a2f2a1c 100644 --- a/etc/menu.conf +++ b/etc/menu.conf @@ -50,7 +50,7 @@ <txt name="man" file="manpage.txt"/> <filesel name="open_file"/> -<filesel name="open_list" file-action="loadlist '%p'" auto-close="yes" +<filesel name="open_list" file-action="loadlist '%p'" title="Open a playlist: %p" filter="/etc/mplayer/extensions_filter" actions="d:run 'mp_loader \'%p\' d',c:run 'mp_loader \'%p\' c'" /> |