summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-07-07 02:56:01 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-07-07 02:56:01 +0300
commita2037a2effbd4622d0e8336245a9b14c3f886bde (patch)
treebd2face6dd36d2663197b23a33da9e9b2814f70c /etc
parent0c2773a709276681575d2507aa60ee85c2d0b850 (diff)
parent43079c51daa8c12b0a44e5ad8022c979dd9e8336 (diff)
downloadmpv-a2037a2effbd4622d0e8336245a9b14c3f886bde.tar.bz2
mpv-a2037a2effbd4622d0e8336245a9b14c3f886bde.tar.xz
Merge svn changes up to r29412
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf49
-rw-r--r--etc/mplayer.desktop11
2 files changed, 52 insertions, 8 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index d35c2f6f6a..f5aeee3eea 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -111,7 +111,11 @@ videocodec mpegpes
fourcc mx3n,mx3p
fourcc AVmp
fourcc mp2v,mpgv
+ fourcc m2v1,m1v1
+ fourcc PIM1 ; Pinnacle hardware-MPEG-1
+ fourcc PIM2 ; Pinnacle hardware-MPEG-2
fourcc VCR2
+ fourcc LMP2 ; Lead mpeg2 in avi
driver mpegpes
out MPES
@@ -123,6 +127,7 @@ videocodec ffmpeg1
fourcc PIM1 ; Pinnacle hardware-MPEG-1
fourcc VCR2
fourcc MPEG
+ fourcc m1v1
driver ffmpeg
dll "mpeg1video"
out YV12,I420,IYUV
@@ -154,6 +159,7 @@ videocodec ffmpeg2
fourcc AVmp
fourcc VCR2
fourcc mp2v,mpgv
+ fourcc m2v1
fourcc PIM2
fourcc LMP2 ; Lead mpeg2 in avi
driver ffmpeg
@@ -192,6 +198,7 @@ videocodec ffmpeg12
fourcc mx3n,mx3p
fourcc AVmp
fourcc mp2v,mpgv
+ fourcc m2v1,m1v1
fourcc LMP2 ; Lead mpeg2 in avi
driver ffmpeg
dll "mpegvideo"
@@ -230,6 +237,7 @@ videocodec mpeg12
fourcc mx3n,mx3p
fourcc AVmp
fourcc mp2v,mpgv
+ fourcc m2v1,m1v1
fourcc LMP2 ; Lead mpeg2 in avi
driver libmpeg2
; dll "libmpeg2"
@@ -266,6 +274,7 @@ videocodec ffmpeg12mc
fourcc mx3n,mx3p
fourcc AVmp
fourcc mp2v,mpgv
+ fourcc m2v1,m1v1
fourcc LMP2 ; Lead mpeg2 in avi
driver ffmpeg
dll "mpegvideo_xvmc"
@@ -303,6 +312,7 @@ videocodec ffmpeg12vdpau
fourcc AVmp
fourcc mp2v,mpgv
fourcc LMP2 ; Lead mpeg2 in avi
+ fourcc m2v1,m1v1
driver ffmpeg
dll "mpegvideo_vdpau"
out VDPAU_MPEG1
@@ -525,6 +535,21 @@ videocodec theora
;WIN32:
+videocodec nogatech
+ status working
+ fourcc NTN1,NTN2
+ driver vfw
+ dll "nuvision.ax"
+ out BGR24 flip
+
+videocodec ylc
+ info "YUY2 Lossless Codec"
+ status working
+ fourcc YLC0
+ driver vfw
+ dll "ylc.vcm"
+ out BGR24 flip
+
videocodec smartsight
info "Verint Video Manager"
status working
@@ -769,7 +794,7 @@ videocodec ffmp42
info "FFmpeg MSMPEG-4 v2"
status working
fourcc DIV2,div2 mp42
- fourcc MP42,mp42
+ fourcc MP42,mp42,Mp42
driver ffmpeg
dll msmpeg4v2
out YV12,I420,IYUV
@@ -841,6 +866,7 @@ videocodec ffh264
fourcc X264,x264
fourcc avc1,AVC1
fourcc davc,DAVC
+ fourcc HDMV
format 0x10000005
driver ffmpeg
dll h264
@@ -853,6 +879,7 @@ videocodec ffh264vdpau
fourcc X264,x264
fourcc avc1,AVC1
fourcc davc,DAVC
+ fourcc HDMV
format 0x10000005
driver ffmpeg
dll h264_vdpau
@@ -1538,7 +1565,7 @@ videocodec ffdv
fourcc dvhq,dvhp
fourcc dvh5,dvh6,dvh3
fourcc dvhd,dvsl,dv25
- fourcc dvs1
+ fourcc dvs1,dvh1
driver ffmpeg
dll dvvideo
out 411P,422P,YV12
@@ -2064,7 +2091,7 @@ videocodec fftm20
fourcc TM20
driver ffmpeg
dll truemotion2
- out YV12
+ out BGR24
; our BGR15->BGR32 is bad or the DLL?
videocodec tm20
@@ -2077,6 +2104,14 @@ videocodec tm20
guid 0x4cb63e61, 0xc611, 0x11D0, 0x83, 0xaa, 0x00, 0x00, 0x92, 0x90, 0x01, 0x84
out BGR32,BGR24,BGR16 flip
+videocodec tr20
+ info "TrueMotion RT"
+ status working
+ fourcc TR20
+ driver vfw
+ dll "tr2032.dll"
+ out BGR15
+
videocodec sif1vfw
info "sif1 alpha4"
status working
@@ -3040,6 +3075,7 @@ audiocodec ffqclp
status buggy
format 0x706C6351 ; "Qclp"
format 0x70637173 ; "sqcp"
+ format 0x716C6351 ; "Qclq"
driver ffmpeg
dll "qcelp"
@@ -3268,6 +3304,7 @@ audiocodec ffadpcmimawav
status working
format 0x11
format 0x1100736d ; "ms\x00\x11" (MOV files)
+ format 0x11005354 ; "TS\x00\x11" (MOV files) works with -demuxer mov
driver ffmpeg
dll adpcm_ima_wav
@@ -3442,6 +3479,7 @@ audiocodec faad
format 0xff
format 0x706D
format 0x4143 ; aac in asf
+ format 0xA106 ; aac in avi
driver faad
dll libfaad2
@@ -3456,6 +3494,7 @@ audiocodec ffaac
format 0xff
format 0x706D
format 0x4143 ; aac in asf
+ format 0xA106 ; aac in avi not yet working
driver ffmpeg
dll aac
@@ -3654,6 +3693,8 @@ audiocodec ffmp2
comment "integer only"
status working
format 0x50
+ fourcc ".mp2" ; MP2 (MOV files)
+ fourcc ".mp1" ; MP1 (MOV files)
driver ffmpeg
dll "mp2"
@@ -3721,6 +3762,7 @@ audiocodec ulaw
status working
format 0x7
format 0x77616c75 ; "ulaw" (MOV files)
+ format 0x6c75
driver alaw
audiocodec dvdpcm
@@ -3744,6 +3786,7 @@ audiocodec ffac3
format 0x2000
format 0x332D6361 ; ac-3 in mp4
fourcc dnet
+ fourcc sac3
driver ffmpeg
dll ac3
diff --git a/etc/mplayer.desktop b/etc/mplayer.desktop
index 0ef3ce737a..5cf03c40aa 100644
--- a/etc/mplayer.desktop
+++ b/etc/mplayer.desktop
@@ -1,11 +1,12 @@
[Desktop Entry]
Type=Application
-Encoding=UTF-8
-Name=MPlayer
+Name=MPlayer Media Player
+Name[ca]=Reproductor multimèdia MPlayer
GenericName=Multimedia player
-Comment=Multimedia player
-Comment[de]=Multimedia-Player
-Comment[es]=Reproductor multimedia
+Comment=Play movies and songs
+Comment[ca]=Reproduïu vídeos i cançons
+Comment[de]=Filme und Musik abspielen
+Comment[es]=Reproduzca vídeos y canciones
Comment[fr]=Lecteur multimédia
Comment[it]=Lettore multimediale
Comment[zh]=多媒体播放器