From 1eb19f0a16850d1552ea368ae905ab8b7f354ab6 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 30 Dec 2009 12:03:53 +0000
Subject: FFmpeg JPEG codecs can output 440p format.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30141 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 5f22c31a2d..89b3e64a08 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1305,6 +1305,7 @@ videocodec ffmjpeg
   dll mjpeg
   out 444P
   out 422P
+  out 440P
   out YUY2  ; queried (conversion from yuv422p)
   out YV12,I420,IYUV
   out BGR32 ; lossless JPEG
@@ -1319,6 +1320,7 @@ videocodec ffmjpegb
   dll mjpegb
   out 444P
   out 422P
+  out 440P
   out YUY2  ; queryed (conversion from yuv422p)
   out YV12,I420,IYUV
 
-- 
cgit v1.2.3


From 3daa4e73cc243b430447761c6642bfb4f37979aa Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 30 Dec 2009 19:30:06 +0000
Subject: Make the ffmpeg decoders for DTS and AC3 the default.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30143 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 89b3e64a08..f4d9793fd1 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -4065,15 +4065,6 @@ audiocodec lpcm
   driver ffmpeg
   dll pcm_bluray
 
-audiocodec a52
-  info "AC3-liba52"
-  status working
-  format 0x2000
-  ; format 0x332D6361 ; ac-3 in mp4  -- not working
-  fourcc dnet
-  driver liba52
-  dll "liba52"
-
 audiocodec ffac3
   info "FFmpeg AC-3"
   status working
@@ -4093,12 +4084,14 @@ audiocodec ffeac3
   driver ffmpeg
   dll eac3
 
-audiocodec dts
-  info "DTS-libdca"
+audiocodec a52
+  info "AC3-liba52"
   status working
-  format 0x2001
-  format 0x86
-  driver libdca
+  format 0x2000
+  ; format 0x332D6361 ; ac-3 in mp4  -- not working
+  fourcc dnet
+  driver liba52
+  dll "liba52"
 
 audiocodec ffdca
   info "FFmpeg DTS"
@@ -4108,6 +4101,13 @@ audiocodec ffdca
   driver ffmpeg
   dll "dca"
 
+audiocodec dts
+  info "DTS-libdca"
+  status working
+  format 0x2001
+  format 0x86
+  driver libdca
+
 audiocodec ffmusepack7
   info "Musepack sv7 audio codec"
   comment "only works with libavformat demuxer"
-- 
cgit v1.2.3


From e25e6ec309e08cbf022adbf6027b259fbe5487db Mon Sep 17 00:00:00 2001
From: compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 30 Dec 2009 19:37:19 +0000
Subject: add tm2x / tm2a binary decoder

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30144 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index f4d9793fd1..e4af8b4c2e 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2239,6 +2239,15 @@ videocodec tm20
   guid 0x4cb63e61, 0xc611, 0x11D0, 0x83, 0xaa, 0x00, 0x00, 0x92, 0x90, 0x01, 0x84
   out BGR32,BGR24,BGR16 flip
 
+videocodec tm2xvfw
+  info "TrueMotion 2.0"
+  status working
+  fourcc TM2X
+  fourcc TM2A TM2X
+  driver vfw
+  dll "tm2X.dll"
+  out BGR32,BGR24,BGR16 flip
+
 videocodec tr20
   info "TrueMotion RT"
   status working
-- 
cgit v1.2.3


From 54e6b786f41a9803f4c5c311ec7b310dad2acc16 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 31 Dec 2009 11:29:21 +0000
Subject: More readable fourcc for ffflac

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30146 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 e4af8b4c2e..efa1cafa9e 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3780,7 +3780,7 @@ audiocodec ffaac
 audiocodec ffflac
   info "FFmpeg FLAC audio"
   status working
-  format 0x43614C66
+  fourcc "fLaC"
   format 0xF1AC
   driver ffmpeg
   dll "flac"
-- 
cgit v1.2.3


From 2150bddc743b27ad425a3f2388f8b97005ce74ab Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 31 Dec 2009 22:53:51 +0000
Subject: Add support for FFmpeg's ffv210 codec.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30153 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 efa1cafa9e..3d88972068 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2638,6 +2638,14 @@ videocodec qtsvq1
   dll "QuickTime.qts"
   out YVU9
 
+videocodec ffv210
+  info "FFmpeg V210 - 10-bit"
+  status untested
+  fourcc v210
+  driver ffmpeg
+  dll v210
+  out 422P16
+
 videocodec qtcine
   info "cinewave uncompressed 10-bit codec"
   status working
-- 
cgit v1.2.3


From 8afc25d710d8520b454d48b7744dde4812feef74 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 31 Dec 2009 23:45:07 +0000
Subject: Add support for YUV format with alpha and fix the codecs.conf entry
 for vp6a to use it. Fixes playback of samples in
 http://samples.mplayerhq.hu/FLV/flash_with_alpha/

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30157 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 3d88972068..be548cac61 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2060,7 +2060,7 @@ videocodec ffvp6a
   fourcc VP6A
   driver ffmpeg
   dll "vp6a"
-  out I420,YUY2,YV12
+  out 420A
 
 videocodec ffvp6f
   info "FFmpeg VP6 Flash"
-- 
cgit v1.2.3