From b635519bbf52d87ce304a3f509fd3f11b2ab8d31 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Sun, 11 Oct 2009 11:31:50 +0000 Subject: Allow playback of files with FourCC IJLV (Intel JPEG Library Video Codec). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29770 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 84660fc82f..f924db871e 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1242,6 +1242,14 @@ videocodec ffmjpeg out RGB24 ; JPEG-LS out Y800 +videocodec ffijlv + info "FFmpeg flipped MJPEG" + status working + fourcc IJLV + driver ffmpeg + dll mjpeg + out 422P flip + videocodec ffmjpegb info "FFmpeg MJPEG-B" status working -- cgit v1.2.3 From 45e11b74d045c1357b6e3788358425f099e20b3d Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 14 Oct 2009 19:19:20 +0000 Subject: Add support for "Forward Uncompressed" decoding via FFmpeg git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29774 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 f924db871e..9339161a86 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1386,6 +1386,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 -- cgit v1.2.3 From e3bc0549dd86c68675e05c992b864b21229a3be4 Mon Sep 17 00:00:00 2001 From: compn Date: Thu, 15 Oct 2009 04:49:56 +0000 Subject: add MVJP fourcc (mjpeg) from ffmpeg git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29775 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'etc') diff --git a/etc/codecs.conf b/etc/codecs.conf index 9339161a86..9aee66015b 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1232,6 +1232,7 @@ videocodec ffmjpeg fourcc MMJP,QIVG fourcc ACDV ; ACDSee jpeg fourcc SLMJ ; SL M-JPEG + fourcc MVJP ; Midvid JPEG Video Codec driver ffmpeg dll mjpeg out 444P -- cgit v1.2.3 From 0c3633c9ffcf78ea317e1f48a36063830044bf8d Mon Sep 17 00:00:00 2001 From: compn Date: Mon, 19 Oct 2009 03:45:14 +0000 Subject: add binary codec for fourcc slif git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29780 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 9aee66015b..0c19f945bf 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2104,6 +2104,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?" -- cgit v1.2.3 From b2e3df350aeec14da52b1eec7d25c8c7595f617a Mon Sep 17 00:00:00 2001 From: cehoyos Date: Mon, 19 Oct 2009 15:47:59 +0000 Subject: Fix playback of Intel JPEG Library Video Codec. Fixes r29770, which probably should not have been committed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29786 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'etc') diff --git a/etc/codecs.conf b/etc/codecs.conf index 0c19f945bf..e580d92183 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1233,6 +1233,7 @@ videocodec ffmjpeg 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 @@ -1243,14 +1244,6 @@ videocodec ffmjpeg out RGB24 ; JPEG-LS out Y800 -videocodec ffijlv - info "FFmpeg flipped MJPEG" - status working - fourcc IJLV - driver ffmpeg - dll mjpeg - out 422P flip - videocodec ffmjpegb info "FFmpeg MJPEG-B" status working -- cgit v1.2.3 From e4a3a38398c5b7d81feb957dc766edde07a96cb6 Mon Sep 17 00:00:00 2001 From: compn Date: Tue, 20 Oct 2009 15:47:36 +0000 Subject: add HDYC fourcc to rawuyvy git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29788 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'etc') diff --git a/etc/codecs.conf b/etc/codecs.conf index e580d92183..a08c912ac2 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2984,6 +2984,7 @@ videocodec rawuyvy format 0x79757632 0x59565955 # 2vuy as created by QuickTime captures format 0x20776172 0x59565955 fourcc uyvy,UYVY + fourcc HDYC UYVY out UYVY videocodec raw444P -- cgit v1.2.3 From b2ebe306216b510c064f716e09cdd7440dcda2f0 Mon Sep 17 00:00:00 2001 From: compn Date: Tue, 20 Oct 2009 16:26:30 +0000 Subject: add V422, YUNV to rawyuy2 add UYNV,UYNY,uyv1,2Vu1 to rawuyvy add P422 to raw422P works on samples/V-codecs/. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29789 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 a08c912ac2..b194c434a0 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2965,6 +2965,8 @@ videocodec rawyuy2 format 0x0 0x32595559 format 0x20776172 0x32595559 fourcc yuy2,YUY2 + fourcc V422 YUY2 + fourcc YUNV YUY2 out YUY2 videocodec rawyuv2 @@ -2985,6 +2987,10 @@ videocodec rawuyvy 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 @@ -3003,6 +3009,7 @@ videocodec raw422P format 0x0 0x50323234 format 0x20776172 0x50323234 fourcc 422p,422P + fourcc P422 422P out 422P videocodec rawyv12 -- cgit v1.2.3 From b0d6753723f4b5ada75d20793be0118d63dfea5c Mon Sep 17 00:00:00 2001 From: compn Date: Mon, 2 Nov 2009 00:11:30 +0000 Subject: add VYUY and Y42B fourccs to rawcodecs git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29811 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 b194c434a0..51b5f3739d 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2967,6 +2967,7 @@ videocodec rawyuy2 fourcc yuy2,YUY2 fourcc V422 YUY2 fourcc YUNV YUY2 + fourcc VYUY YUY2 out YUY2 videocodec rawyuv2 @@ -3010,6 +3011,7 @@ videocodec raw422P format 0x20776172 0x50323234 fourcc 422p,422P fourcc P422 422P + fourcc Y42B 422P out 422P videocodec rawyv12 -- cgit v1.2.3 From 76c5520d7490061f3210bc4200f62fc59ac12744 Mon Sep 17 00:00:00 2001 From: compn Date: Tue, 3 Nov 2009 19:45:43 +0000 Subject: add audio format 0x55005354 to mp3, fixes unknown_audio_codec.avi git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29815 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 51b5f3739d..9b49433456 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -3700,6 +3700,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 @@ -3769,6 +3770,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 -- cgit v1.2.3 From 869aad500ef7c0bf18c78876a578c236dbb63de7 Mon Sep 17 00:00:00 2001 From: compn Date: Tue, 3 Nov 2009 20:03:37 +0000 Subject: add ffmpeg eatgv codec patch by Jan Engelhardt jengelh ta medozas.de git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29816 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 9b49433456..29abbd1d52 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2834,6 +2834,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) -- cgit v1.2.3 From 47271a8598487344a5de13774dfa042954e51a7e Mon Sep 17 00:00:00 2001 From: compn Date: Tue, 3 Nov 2009 20:18:47 +0000 Subject: add yuvs fourcc, fixes yuvs.mov git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29817 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'etc') diff --git a/etc/codecs.conf b/etc/codecs.conf index 29abbd1d52..bdf3568efe 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2975,6 +2975,7 @@ videocodec rawyuy2 fourcc V422 YUY2 fourcc YUNV YUY2 fourcc VYUY YUY2 + fourcc yuvs YUY2 out YUY2 videocodec rawyuv2 -- cgit v1.2.3 From 4532c8ad2f8db6ed7320b907dba67b23de7972b1 Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 5 Nov 2009 18:53:05 +0000 Subject: Add a profile example and (commented-out) useful defaults for dvdnav to example.conf git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29825 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/example.conf | 3 +++ 1 file changed, 3 insertions(+) (limited to 'etc') 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 -- cgit v1.2.3 From 4ca9381eaefeedbbd22f31eaa3ce90221ed69d53 Mon Sep 17 00:00:00 2001 From: zuxy Date: Tue, 10 Nov 2009 11:51:22 +0000 Subject: Delete "auto-close" from configuration whose support has long been removed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29876 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/menu.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'etc') diff --git a/etc/menu.conf b/etc/menu.conf index bb8177fa76..8aa273bcb7 100644 --- a/etc/menu.conf +++ b/etc/menu.conf @@ -50,7 +50,7 @@ - -- cgit v1.2.3 From 2b93a48ac8e092a74001b406ed9a20b6025faee6 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Tue, 10 Nov 2009 19:11:13 +0000 Subject: Support VDPAU hardware accelerated decoding of MPEG-4 ASP on capable hardware. Original patch by NVIDIA corporation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29885 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'etc') diff --git a/etc/codecs.conf b/etc/codecs.conf index bdf3568efe..ac3dc06aca 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -954,6 +954,37 @@ videocodec ffodivx dll mpeg4 ;opendivx out YV12,I420,IYUV +videocodec ffodivxvdpau + info "FFmpeg MPEG-4,DIVX-4/5 (VDPAU)" + 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 + driver ffmpeg + dll mpeg4_vdpau + out VDPAU_MPEG4 + videocodec ffwv1f info "WV1F MPEG-4" status working -- cgit v1.2.3