From 6f9eda08c23fde92600cfc1965028f1863031a31 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 10 Nov 2007 21:22:53 +0000
Subject: Get rid of M$ silliness.

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

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 49b0bfa13d..f77a883299 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -528,10 +528,10 @@ videocodec fffsv
   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 @@ videocodec ffdivx
   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 @@ videocodec ffmp42
   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 @@ videocodec ffmp41
   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 @@ videocodec ffwmv1
   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 @@ videocodec ffwmv2
   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 @@ videocodec ffwmv3
   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 @@ videocodec divx4vfw
 ; 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 @@ videocodec divxds
   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
-- 
cgit v1.2.3