From 3f7f582557feb12237174a19e0c0dbfcf307b194 Mon Sep 17 00:00:00 2001 From: compn Date: Tue, 26 May 2009 00:19:31 +0000 Subject: add binary decoder for YLC0 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29323 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'etc') diff --git a/etc/codecs.conf b/etc/codecs.conf index d35c2f6f6a..6cd7fd64e7 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -525,6 +525,14 @@ videocodec theora ;WIN32: +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 -- cgit v1.2.3 From f3d29882972ec21956adff440823950c8c3a6b82 Mon Sep 17 00:00:00 2001 From: compn Date: Tue, 26 May 2009 01:02:16 +0000 Subject: add dvh1 fourcc to ffdv codec, fixes dvh1_sample_truncated.avi and Mp42 fourcc to ffmp42 codec, fixes unknown_audio_codec.avi git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29324 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'etc') diff --git a/etc/codecs.conf b/etc/codecs.conf index 6cd7fd64e7..26119070f5 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -777,7 +777,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 @@ -1546,7 +1546,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 -- cgit v1.2.3 From 3c2096500391132f448de0ac47fef36c2d879178 Mon Sep 17 00:00:00 2001 From: compn Date: Fri, 12 Jun 2009 02:39:21 +0000 Subject: sync with ffmpeg git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29356 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'etc') diff --git a/etc/codecs.conf b/etc/codecs.conf index 26119070f5..606c40c8d2 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 + fourcc PIM1 ; Pinnacle hardware-MPEG-1 + fourcc PIM2 ; Pinnacle hardware-MPEG-2 fourcc VCR2 + fourcc LMP2 ; Lead mpeg2 in avi driver mpegpes out MPES @@ -154,6 +158,7 @@ videocodec ffmpeg2 fourcc AVmp fourcc VCR2 fourcc mp2v,mpgv + fourcc m2v1 fourcc PIM2 fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg @@ -192,6 +197,7 @@ videocodec ffmpeg12 fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv + fourcc m2v1 fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg dll "mpegvideo" @@ -230,6 +236,7 @@ videocodec mpeg12 fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv + fourcc m2v1 fourcc LMP2 ; Lead mpeg2 in avi driver libmpeg2 ; dll "libmpeg2" @@ -266,6 +273,7 @@ videocodec ffmpeg12mc fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv + fourcc m2v1 fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg dll "mpegvideo_xvmc" @@ -303,6 +311,7 @@ videocodec ffmpeg12vdpau fourcc AVmp fourcc mp2v,mpgv fourcc LMP2 ; Lead mpeg2 in avi + fourcc m2v1 driver ffmpeg dll "mpegvideo_vdpau" out VDPAU_MPEG1 @@ -3048,6 +3057,7 @@ audiocodec ffqclp status buggy format 0x706C6351 ; "Qclp" format 0x70637173 ; "sqcp" + format 0x716C6351 ; "Qclq" driver ffmpeg dll "qcelp" -- cgit v1.2.3 From 7fbd75845cef0a69a61f148f7d03a101550128a5 Mon Sep 17 00:00:00 2001 From: compn Date: Fri, 12 Jun 2009 11:23:22 +0000 Subject: sync with ffmpeg git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29357 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'etc') diff --git a/etc/codecs.conf b/etc/codecs.conf index 606c40c8d2..6ec7ae9be6 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -3739,6 +3739,7 @@ audiocodec ulaw status working format 0x7 format 0x77616c75 ; "ulaw" (MOV files) + format 0x6c75 driver alaw audiocodec dvdpcm @@ -3762,6 +3763,7 @@ audiocodec ffac3 format 0x2000 format 0x332D6361 ; ac-3 in mp4 fourcc dnet + fourcc sac3 driver ffmpeg dll ac3 -- cgit v1.2.3 From 3657b0185c69408e08c50fdb39422ce07c505298 Mon Sep 17 00:00:00 2001 From: compn Date: Sat, 13 Jun 2009 12:32:05 +0000 Subject: sync with ffmpeg add m1v1 fourcc to mpeg1 codec add another format to ima wav adpcm from facebook samples git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29359 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'etc') diff --git a/etc/codecs.conf b/etc/codecs.conf index 6ec7ae9be6..b5e1f4de61 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -111,7 +111,7 @@ videocodec mpegpes fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv - fourcc m2v1 + fourcc m2v1,m1v1 fourcc PIM1 ; Pinnacle hardware-MPEG-1 fourcc PIM2 ; Pinnacle hardware-MPEG-2 fourcc VCR2 @@ -127,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 @@ -197,7 +198,7 @@ videocodec ffmpeg12 fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv - fourcc m2v1 + fourcc m2v1,m1v1 fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg dll "mpegvideo" @@ -236,7 +237,7 @@ videocodec mpeg12 fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv - fourcc m2v1 + fourcc m2v1,m1v1 fourcc LMP2 ; Lead mpeg2 in avi driver libmpeg2 ; dll "libmpeg2" @@ -273,7 +274,7 @@ videocodec ffmpeg12mc fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv - fourcc m2v1 + fourcc m2v1,m1v1 fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg dll "mpegvideo_xvmc" @@ -311,7 +312,7 @@ videocodec ffmpeg12vdpau fourcc AVmp fourcc mp2v,mpgv fourcc LMP2 ; Lead mpeg2 in avi - fourcc m2v1 + fourcc m2v1,m1v1 driver ffmpeg dll "mpegvideo_vdpau" out VDPAU_MPEG1 @@ -3286,6 +3287,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 -- cgit v1.2.3 From 91cb465fd3a21f2c807a8edc016671e09a11e53a Mon Sep 17 00:00:00 2001 From: compn Date: Wed, 17 Jun 2009 05:18:28 +0000 Subject: add .mp1/.mp2 mov audio fourcc to ffmp2 codec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29368 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'etc') diff --git a/etc/codecs.conf b/etc/codecs.conf index b5e1f4de61..388c3dc11a 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -3674,6 +3674,8 @@ audiocodec ffmp2 comment "integer only" status working format 0x50 + fourcc ".mp2" ; MP2 (MOV files) + fourcc ".mp1" ; MP1 (MOV files) driver ffmpeg dll "mp2" -- cgit v1.2.3 From a0bb6087413120a4035ac115fa7813481c851179 Mon Sep 17 00:00:00 2001 From: siretart Date: Wed, 17 Jun 2009 09:14:17 +0000 Subject: Conform to the updated Desktop File Specification. Also improve the wording of the Name and Comment field. Also update the german translation. Other translations based on a suggestion from Siegfried Gevatter . git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29369 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/mplayer.desktop | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'etc') 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]=多媒体播放器 -- cgit v1.2.3 From 498b8d3f7378e643117582f0b5bda25edbeac9eb Mon Sep 17 00:00:00 2001 From: kostya Date: Sat, 20 Jun 2009 18:18:35 +0000 Subject: 1l to Reimar for not updating lavc TM2 decoder output format in codecs.conf git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29376 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'etc') diff --git a/etc/codecs.conf b/etc/codecs.conf index 388c3dc11a..db1e60df92 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2082,7 +2082,7 @@ videocodec fftm20 fourcc TM20 driver ffmpeg dll truemotion2 - out YV12 + out BGR24 ; our BGR15->BGR32 is bad or the DLL? videocodec tm20 -- cgit v1.2.3 From ec7dc561481ae6acf70c85e24b3d045c6af20b9f Mon Sep 17 00:00:00 2001 From: cehoyos Date: Fri, 26 Jun 2009 21:32:25 +0000 Subject: Fix some blu-ray samples: HDMV == H264 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29404 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'etc') diff --git a/etc/codecs.conf b/etc/codecs.conf index db1e60df92..6f0ba9551c 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -859,6 +859,7 @@ videocodec ffh264 fourcc X264,x264 fourcc avc1,AVC1 fourcc davc,DAVC + fourcc HDMV format 0x10000005 driver ffmpeg dll h264 @@ -871,6 +872,7 @@ videocodec ffh264vdpau fourcc X264,x264 fourcc avc1,AVC1 fourcc davc,DAVC + fourcc HDMV format 0x10000005 driver ffmpeg dll h264_vdpau -- cgit v1.2.3 From 7a264031e226b0bdea2006ccf91f3442fbf5d8d4 Mon Sep 17 00:00:00 2001 From: compn Date: Sat, 27 Jun 2009 11:57:20 +0000 Subject: add 0xA106 twocc to aac decoders, fixes facebook sample git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29405 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'etc') diff --git a/etc/codecs.conf b/etc/codecs.conf index 6f0ba9551c..f26a736689 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -3464,6 +3464,7 @@ audiocodec faad format 0xff format 0x706D format 0x4143 ; aac in asf + format 0xA106 ; aac in avi driver faad dll libfaad2 @@ -3478,6 +3479,7 @@ audiocodec ffaac format 0xff format 0x706D format 0x4143 ; aac in asf + format 0xA106 ; aac in avi not yet working driver ffmpeg dll aac -- cgit v1.2.3 From c6672ee42c4f7e6fbbb77e6dcbffa87ffa84e605 Mon Sep 17 00:00:00 2001 From: compn Date: Sat, 27 Jun 2009 12:53:58 +0000 Subject: add binary codec for NTN1 and NTN2 fourcc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29406 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'etc') diff --git a/etc/codecs.conf b/etc/codecs.conf index f26a736689..55d6ca13e9 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -535,6 +535,13 @@ 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 -- cgit v1.2.3 From bc3743fd63c6a8f3344dc538062704d8947a985f Mon Sep 17 00:00:00 2001 From: compn Date: Fri, 3 Jul 2009 16:10:58 +0000 Subject: add truemotion rt binary codec for TR20 fourcc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29410 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'etc') diff --git a/etc/codecs.conf b/etc/codecs.conf index 55d6ca13e9..f5aeee3eea 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2104,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 -- cgit v1.2.3