Mercurial > mplayer.hg

changeset 24987:6df2a14e2cf6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of M$ silliness.
author diego
date Sat, 10 Nov 2007 21:22:53 +0000
parents 42482c2e8f6c
children 2ea950b50771
files etc/codecs.conf
diffstat 1 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Sat Nov 10 20:45:28 2007 +0000
+++ b/etc/codecs.conf	Sat Nov 10 21:22:53 2007 +0000
@@ -528,10 +528,10 @@
   out BGR24
 
 videocodec ffdivx
-  info "FFmpeg DivX ;-) (MS MPEG-4 v3)"
+  info "FFmpeg DivX ;-) (MSMPEG-4 v3)"
   status working
   fourcc MPG3,mpg3 div3
-  fourcc MP43,mp43 div3   ; M$ MPEG-4 v3   (fourcc mapping to div3)
+  fourcc MP43,mp43 div3   ; MSMPEG-4 v3   (fourcc mapping to div3)
   fourcc DIV5,div5 div3   ; DivX 3.20 
   fourcc DIV6,div6 div4   ;   -||-
   fourcc DIV3,div3,DIV4,div4
@@ -543,7 +543,7 @@
   out YV12,I420,IYUV
   
 videocodec ffmp42
-  info "FFmpeg M$ MPEG-4 v2"
+  info "FFmpeg MSMPEG-4 v2"
   status working
   fourcc DIV2,div2 mp42
   fourcc MP42,mp42
@@ -552,7 +552,7 @@
   out YV12,I420,IYUV
 
 videocodec ffmp41
-  info "FFmpeg M$ MPEG-4 v1"
+  info "FFmpeg MSMPEG-4 v1"
   status working
   fourcc DIV1,div1 mpg4
   fourcc MPG4,mpg4
@@ -561,7 +561,7 @@
   out YV12,I420,IYUV
 
 videocodec ffwmv1
-  info "FFmpeg M$ WMV1/WMV7"
+  info "FFmpeg WMV1/WMV7"
   status working
   fourcc WMV1,wmv1
   driver ffmpeg
@@ -569,7 +569,7 @@
   out YV12,I420,IYUV
 
 videocodec ffwmv2
-  info "FFmpeg M$ WMV2/WMV8"
+  info "FFmpeg WMV2/WMV8"
   status buggy
   fourcc WMV2,wmv2
   driver ffmpeg
@@ -577,7 +577,7 @@
   out YV12,I420,IYUV
 
 videocodec ffwmv3
-  info "FFmpeg M$ WMV3/WMV9"
+  info "FFmpeg WMV3/WMV9"
   status buggy
   fourcc WMV3,wmv3
   driver ffmpeg
@@ -585,7 +585,7 @@
   out YV12,I420,IYUV
   
 videocodec ffvc1
-  info "FFmpeg M$ WVC1"
+  info "FFmpeg WVC1"
   status buggy
   fourcc WVC1,wvc1,WMVA
   driver ffmpeg
@@ -692,7 +692,7 @@
 ; the original ones...  prefer DShow for postprocessing:
 
 videocodec divxds
-  info "DivX ;-) (MS MPEG-4 v3)"
+  info "DivX ;-) (MSMPEG-4 v3)"
   comment "with postprocessing"
   status working
   fourcc MP43,mp43 div3   ; fourcc mapping to div3
@@ -707,9 +707,9 @@
   out BGR32,BGR24,BGR16,BGR15
 
 videocodec divx
-  info "DivX ;-) (MS MPEG-4 v3)"
+  info "DivX ;-) (MSMPEG-4 v3)"
   status working
-  fourcc MP43,mp43 div3   ; M$ MPEG-4 v3   (fourcc mapping to div3)
+  fourcc MP43,mp43 div3   ; MSMPEG-4 v3   (fourcc mapping to div3)
   fourcc DIV5,div5 div3   ; DivX 3.20 
   fourcc DIV6,div6 div4   ;   -||-
   fourcc DIV3,div3,DIV4,div4