added Juanjo's H263+ patch, and ffmpeg native codecs

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1279 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 68 insertions, 15 deletions

diff --git a/DOCS/codecs.conf b/DOCS/codecs.conf
index db84c52818..dc2cd61129 100644
--- a/DOCS/codecs.conf
+++ b/DOCS/codecs.conf
@@ -4,6 +4,38 @@
 ;                   VIDEO CODECS
 ;=============================================================================
 
+; =============== Win32/libmpeg2/ProjectMayo MPEG CODECS =====================
+
+videocodec u263
+  info "UB Video H.263+ Decoder"
+  comment "added by Juanjo"
+  status working
+  fourcc U263
+  driver dshow
+  dll "ubv263d+.ax"
+  guid 0x00af1181, 0x6ebb, 0x11d4, 0x9d, 0x5a, 0x00, 0x50, 0x04, 0x79, 0x6c, 0xc0
+;  out I420 flip
+;  out YVYU flip,noflip
+;  out YV12 flip
+;  out UYVY flip,noflip
+;  out YUY2 flip
+  out BGR24 flip
+
+videocodec divxds
+  info "DivX ;-) (MS MPEG-4 v3)"
+  comment "with postprocessing"
+  status working
+  fourcc MP43,mp43 div3   ; fourcc mapping to div3
+  fourcc DIV5,div5 div3
+  fourcc DIV6,div6 div4
+  fourcc DIV3,div3,DIV4,div4
+  driver dshow
+  dll "divx_c32.ax"
+  guid 0x82CCd3E0, 0xF71A, 0x11D0, 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa
+;  out YV12
+  out YUY2
+  out BGR32,BGR24,BGR16,BGR15
+
 videocodec mpeg12
   info "MPEG 1 or 2"
   comment "with postprocessing"
@@ -38,21 +70,6 @@ videocodec mpeg4ds
   out YUY2
   out BGR32,BGR24,BGR16,BGR15
 
-videocodec divxds
-  info "DivX ;-) (MS MPEG-4 v3)"
-  comment "with postprocessing"
-  status working
-  fourcc MP43,mp43 div3   ; fourcc mapping to div3
-  fourcc DIV5,div5 div3
-  fourcc DIV6,div6 div4
-  fourcc DIV3,div3,DIV4,div4
-  driver dshow
-  dll "divx_c32.ax"
-  guid 0x82CCd3E0, 0xF71A, 0x11D0, 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa
-;  out YV12
-  out YUY2
-  out BGR32,BGR24,BGR16,BGR15
-
 videocodec divx
   info "DivX ;-) (MS MPEG-4 v3)"
   status working
@@ -77,6 +94,42 @@ videocodec odivx
   dll "opendivx decore"
   out YV12
 
+; =============== FFMPEG MPEG CODECS =========================
+
+videocodec ffdivx
+  info "FFmpeg DivX ;-) (MS MPEG-4 v3)"
+  status working
+  fourcc MP43,mp43 div3   ; M$ MPEG4 v3   (fourcc mapping to div3)
+  fourcc DIV5,div5 div3   ; DivX 3.20 
+  fourcc DIV6,div6 div4   ;   -||-
+  fourcc DIV3,div3,DIV4,div4
+  driver ffmpeg
+  dll msmpeg4
+  out YV12
+
+videocodec ffodivx
+  info "FFmpeg OpenDivX"
+  status working
+  fourcc DIVX,divx
+  fourcc DIV1,div1 divx
+  fourcc MP4S,mp4s	; ISO MPEG-4 Video V1
+  format 0x4
+  driver ffmpeg
+  dll opendivx
+  out YV12
+
+videocodec ffmpeg12
+  info "FFmpeg-1"
+  status working
+  format 0x10000001
+  driver ffmpeg
+  dll "mpeg1video"
+  out YV12
+
+
+; ============== OTHER STUFF =======================
+
+
 videocodec indeo5ds
   info "Intel Indeo 5"
   status working