[Mplayer-cvslog] CVS: main/DOCS codecs.conf,1.2,1.3

[GEREOFFY]

Update of /cvsroot/mplayer/main/DOCS
In directory usw-pr-cvs1:/tmp/cvs-serv23750/DOCS

Modified Files:
	codecs.conf 
Log Message:
codecs.conf support

Index: codecs.conf
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/codecs.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** codecs.conf	2001/04/01 16:49:26	1.2
--- codecs.conf	2001/04/07 21:27:57	1.3
***************
*** 3,6 ****
--- 3,12 ----
  ;  mplayer will use codecs.c!!!
  
+ videocodec mpeg12
+   info "MPEG 1 or 2"
+   format 0x1
+   driver libmpeg2
+   out YV12
+ 
  videocodec mpeg4
    info "Microsoft MPEG-4 v1/v2"
***************
*** 10,17 ****
    driver vfw
    dll "mpg4c32.dll"
!   out YUY2 noflip,yuvhack
!   out RGB32,RGB24,RGB15
  
! videocodec divx
    info "DivX ;-) (MS MPEG-4 v3)"
    comment "DivX rulez ;-)"
--- 16,23 ----
    driver vfw
    dll "mpg4c32.dll"
!   out YUY2 yuvhack
!   out BGR32,BGR24,BGR15
  
! videocodec divxds
    info "DivX ;-) (MS MPEG-4 v3)"
    comment "DivX rulez ;-)"
***************
*** 20,29 ****
    fourcc DIV6,div6 div4
    fourcc DIV3,div3,DIV4,div3
!   driver vfw
!   dll "divxc32.dll"
!   out YUY2 noflip,yuvhack
!   out RGB32,RGB24,RGB15
!   
! videocodec divxds
    info "DivX ;-) (MS MPEG-4 v3)"
    comment "DivX rulez ;-)"
--- 26,36 ----
    fourcc DIV6,div6 div4
    fourcc DIV3,div3,DIV4,div3
!   driver dshow
!   dll "divx_c32.ax"
!   guid 0x82CCd3E0, 0xF71A, 0x11D0, 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa
!   out YUY2
!   out BGR32,BGR24,BGR16,BGR15
! 
! videocodec divx
    info "DivX ;-) (MS MPEG-4 v3)"
    comment "DivX rulez ;-)"
***************
*** 32,41 ****
    fourcc DIV6,div6 div4
    fourcc DIV3,div3,DIV4,div3
!   driver dshow
!   dll "divx_c32.ax"
!   guid 0x82CCd3E0, 0xF71A, 0x11D0, 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa
!   out YUY2 noflip
!   out RGB32,RGB24,RGB16,RGB15 noflip
! 
  videocodec odivx
    info "OpenDivX (MPEG-4 v2)"
--- 39,47 ----
    fourcc DIV6,div6 div4
    fourcc DIV3,div3,DIV4,div3
!   driver vfw
!   dll "divxc32.dll"
!   out YUY2 yuvhack
!   out BGR32,BGR24,BGR15
!   
  videocodec odivx
    info "OpenDivX (MPEG-4 v2)"
***************
*** 43,47 ****
    fourcc DIV1,div1 divx
    driver odivx
!   out YV12 noflip
  
  videocodec indeo5
--- 49,53 ----
    fourcc DIV1,div1 divx
    driver odivx
!   out YV12
  
  videocodec indeo5
***************
*** 50,55 ****
    driver vfw
    dll "ir50_32.dll"
!   out YUY2 noflip
!   out RGB32,RGB24,RGB15 noflip
  
  videocodec indeo4
--- 56,61 ----
    driver vfw
    dll "ir50_32.dll"
!   out YUY2
!   out BGR32,BGR24,BGR15
  
  videocodec indeo4
***************
*** 59,63 ****
    driver vfw
    dll "ir41_32.dll"
!   out RGB24,RGB15 flip
  
  videocodec indeo3
--- 65,69 ----
    driver vfw
    dll "ir41_32.dll"
!   out BGR24,BGR15 flip
  
  videocodec indeo3
***************
*** 68,72 ****
    driver vfw
    dll "ir32_32.dll"
!   out RGB24,RGB15 flip
  
  videocodec cvid
--- 74,78 ----
    driver vfw
    dll "ir32_32.dll"
!   out BGR24,BGR15 flip
  
  videocodec cvid
***************
*** 75,80 ****
    driver vfw
    dll "msvidc32.dll"
!   out YUY2 noflip
!   out RGB24,RGB15 noflip
  
  videocodec cram
--- 81,86 ----
    driver vfw
    dll "msvidc32.dll"
!   out YUY2
!   out BGR24,BGR15
  
  videocodec cram
***************
*** 83,87 ****
    driver vfw
    dll "msvidc32.dll"
!   out RGB24,RGB15 noflip
  
  videocodec vcr2
--- 89,93 ----
    driver vfw
    dll "msvidc32.dll"
!   out BGR24,BGR15
  
  videocodec vcr2
***************
*** 90,95 ****
    driver vfw
    dll "ativcr2.dll"
!   out YUY2 noflip
!   out RGB32,RGB24,RGB15 noflip
  
  videocodec i263
--- 96,101 ----
    driver vfw
    dll "ativcr2.dll"
!   out YUY2
!   out BGR32,BGR24,BGR15
  
  videocodec i263
***************
*** 99,103 ****
    driver vfw
    dll "i263_32.drv"
!   out RGB32,RGB24,RGB15 noflip
  
  videocodec mjpeg
--- 105,109 ----
    driver vfw
    dll "i263_32.drv"
!   out BGR32,BGR24,BGR15
  
  videocodec mjpeg
***************
*** 107,112 ****
    dll "mcmjpg32.dll"
  ;  dll "m3jpeg32.dll"
!   out YUY2 noflip
!   out RGB32,RGB24,RGB15 noflip
  
  videocodec wmv1
--- 113,118 ----
    dll "mcmjpg32.dll"
  ;  dll "m3jpeg32.dll"
!   out YUY2
!   out BGR32,BGR24,BGR15
  
  videocodec wmv1
***************
*** 116,121 ****
    dll "wmvds32.ax"
    guid 0x4facbba1, 0xffd8, 0x4cd7, 0x82, 0x28, 0x61, 0xe2, 0xf6, 0x5c, 0xb1, 0xae
!   out YUY2 noflip
!   out RGB32,RGB24,RGB16,RGB15 noflip
  
  audiocodec divx
--- 122,127 ----
    dll "wmvds32.ax"
    guid 0x4facbba1, 0xffd8, 0x4cd7, 0x82, 0x28, 0x61, 0xe2, 0xf6, 0x5c, 0xb1, 0xae
!   out YUY2
!   out BGR32,BGR24,BGR16,BGR15
  
  audiocodec divx
***************
*** 166,169 ****
--- 172,190 ----
    format 0x32
    driver msgsm
+ 
+ audiocodec alaw
+   info "aLaw"
+   format 0x6
+   driver alaw
+ 
+ audiocodec pcm
+   info "Uncompressed PCM"
+   format 0x1
+   driver pcm
+ 
+ audiocodec ac3
+   info "AC3"
+   format 0x2000
+   driver libac3
  
  audiocodec voxware


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog