From cb8ae3fe63a2d58cf29d23dfb733781563186b08 Mon Sep 17 00:00:00 2001 From: compn Date: Tue, 1 Dec 2009 05:02:26 +0000 Subject: add slif fourcc (modified mpeg2 codec) to ffmpeg sw decoders git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29973 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 49faf25322..2a16832ab8 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -162,6 +162,7 @@ videocodec ffmpeg2 fourcc m2v1 fourcc PIM2 fourcc LMP2 ; Lead mpeg2 in avi + fourcc slif ; SoftLab MPEG-2 I-frames Codec driver ffmpeg dll "mpeg2video" out YV12,I420,IYUV @@ -200,6 +201,7 @@ videocodec ffmpeg12 fourcc mp2v,mpgv fourcc m2v1,m1v1 fourcc LMP2 ; Lead mpeg2 in avi + fourcc slif ; SoftLab MPEG-2 I-frames Codec driver ffmpeg dll "mpegvideo" out YV12,I420,IYUV -- cgit v1.2.3 From c145024193f869a660826edabe3fb49287fda9aa Mon Sep 17 00:00:00 2001 From: compn Date: Thu, 3 Dec 2009 21:04:53 +0000 Subject: fix apple.com trailer example, via carl git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29975 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/example.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'etc') diff --git a/etc/example.conf b/etc/example.conf index a0fec86eb0..0868820e56 100644 --- a/etc/example.conf +++ b/etc/example.conf @@ -93,7 +93,7 @@ # Pretend to be Quicktime # Fixes playback for apple.com/trailers redirects -#user-agent="QuickTime/7.1.3 (qtver=7.1.3;cpu=PPC;os=Mac 10.4.8)" +#user-agent="QuickTime" # Drop frames to preserve audio/video sync. #framedrop = yes -- cgit v1.2.3 From 3b1e70e3ee7dd2a1960eec918fb6cfb3e0624143 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Tue, 8 Dec 2009 23:58:42 +0000 Subject: Support FourCC's AVI1 and AVI2 as MJPEG. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29982 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 2a16832ab8..34ce6fcf2e 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1267,6 +1267,7 @@ videocodec ffmjpeg fourcc SLMJ ; SL M-JPEG fourcc MVJP ; Midvid JPEG Video Codec fourcc IJLV ; Intel JPEG Library Video Codec + fourcc avi1,avi2 driver ffmpeg dll mjpeg out 444P -- cgit v1.2.3 From de3620319a1ea2f711da09e4d8f3e20f229361bb Mon Sep 17 00:00:00 2001 From: compn Date: Wed, 9 Dec 2009 20:20:18 +0000 Subject: vdpau codecs config entry by beandog git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29987 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/example.conf | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'etc') diff --git a/etc/example.conf b/etc/example.conf index 0868820e56..97b4d91b7c 100644 --- a/etc/example.conf +++ b/etc/example.conf @@ -16,6 +16,10 @@ # video settings # ################## +# Specify vdpau codecs when using -vo vdpau. +#[vo.vdpau] +#vc=ffmpeg12vdpau,ffwmv3vdpau,ffvc1vdpau,ffh264vdpau,ffodivxvdpau, + # Specify default video driver (see -vo help for a list). #vo=xv -- cgit v1.2.3 From a3c7601ce8fe772c901e42ce29e638a62522fa3f Mon Sep 17 00:00:00 2001 From: compn Date: Sun, 13 Dec 2009 19:21:38 +0000 Subject: add MTSJ fourcc to ffmjpeg and ldead mjpeg codec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29997 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 34ce6fcf2e..2bd04ec012 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1268,6 +1268,7 @@ videocodec ffmjpeg fourcc MVJP ; Midvid JPEG Video Codec fourcc IJLV ; Intel JPEG Library Video Codec fourcc avi1,avi2 + fourcc MTSJ driver ffmpeg dll mjpeg out 444P @@ -1343,6 +1344,7 @@ videocodec LEAD fourcc MJPG fourcc jpeg MJPG ; MOV Photo-JPEG fourcc LEAD + fourcc MTSJ MJPG driver vfw dll "LCodcCMP.dll" out BGR24,BGR15 -- cgit v1.2.3 From 8448c911533acaf60aeb3d2780c32c015d13f0c4 Mon Sep 17 00:00:00 2001 From: compn Date: Tue, 15 Dec 2009 02:13:51 +0000 Subject: add spdif example from beandog git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30041 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 97b4d91b7c..bdd3cb56bf 100644 --- a/etc/example.conf +++ b/etc/example.conf @@ -86,6 +86,9 @@ # Resample the sound to 44100Hz with the lavcresample audio filter. #af=lavcresample=44100 +# Output audio to S/PDIF +#ao=alsa:device=spdif +#ac=hwac3,hwdts,hwmpa, ################## # other settings # -- cgit v1.2.3 From 54fc3a69e7e11d2dd27e1d9277fd182ad8ebe3fd Mon Sep 17 00:00:00 2001 From: cehoyos Date: Thu, 17 Dec 2009 20:15:34 +0000 Subject: Support R210 uncompressed 10 bit RGB codec. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30053 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 2bd04ec012..9c7751b909 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -76,6 +76,14 @@ videocodec yuv8 out YV12,I420,UYVY out BGR24,BGR15,BGR32 +videocodec ffr210 + info "FFmpeg R210 - 10-bit RGB" + status working + fourcc r210 + driver ffmpeg + dll "r210" + out RGB48BE,RGB48LE + videocodec blackmagic info "Blackmagic 10-bit" status working -- cgit v1.2.3