From 4d1425c708ac2f2b9a74b2c17037f50aae554eea Mon Sep 17 00:00:00 2001
From: compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 19 Sep 2008 20:58:20 +0000
Subject: sync with videolan

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

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 105bcda634..0577444f59 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -91,6 +91,8 @@ videocodec mpegpes
   fourcc mx5n,mx5p,mx4n,mx4p
   fourcc mx3n,mx3p
   fourcc AVmp
+  fourcc mp2v,mpgv
+  fourcc VCR2
   driver mpegpes
   out MPES
 
@@ -131,6 +133,8 @@ videocodec ffmpeg2
   fourcc mx5n,mx5p,mx4n,mx4p
   fourcc mx3n,mx3p
   fourcc AVmp
+  fourcc VCR2
+  fourcc mp2v,mpgv
   driver ffmpeg
   dll "mpeg2video"
   out YV12,I420,IYUV
@@ -165,6 +169,7 @@ videocodec ffmpeg12
   fourcc mx5n,mx5p,mx4n,mx4p
   fourcc mx3n,mx3p
   fourcc AVmp
+  fourcc mp2v,mpgv
   driver ffmpeg
   dll "mpegvideo"
   out YV12,I420,IYUV
@@ -200,6 +205,7 @@ videocodec mpeg12
   fourcc mx5n,mx5p,mx4n,mx4p
   fourcc mx3n,mx3p
   fourcc AVmp
+  fourcc mp2v,mpgv
   driver libmpeg2
 ;  dll "libmpeg2"
   out YV12,I420,IYUV
@@ -233,6 +239,7 @@ videocodec ffmpeg12mc
   fourcc mx5n,mx5p,mx4n,mx4p
   fourcc mx3n,mx3p
   fourcc AVmp
+  fourcc mp2v,mpgv
   driver ffmpeg
   dll "mpegvideo_xvmc"
   out IDCT_MPEG2
@@ -647,6 +654,7 @@ videocodec ffindeo2
   info "Indeo 2 native decoder"
   status working
   fourcc RT21
+  fourcc IV20
   driver ffmpeg
   dll indeo2
   out YVU9
@@ -774,6 +782,9 @@ videocodec ffodivx
   fourcc VIDM ; vidm 4.01 codec
   format 0x10000004  ; mpeg 4 es
   fourcc 4000,BLZ0
+  fourcc m4cc,M4CC
+  fourcc hdx4,HDX4
+  fourcc FVFW,fvfw
   driver ffmpeg
   dll mpeg4 ;opendivx
   out YV12,I420,IYUV
@@ -1215,6 +1226,7 @@ videocodec ffh263
   fourcc s263,S263
   fourcc D263     ; DEC H263
   fourcc L263     ; Lead H263
+  fourcc ILVR     ; ITU H263+
   driver ffmpeg
   dll h263
   out YV12,I420,IYUV
@@ -3008,6 +3020,7 @@ audiocodec ffdv
   status working
   fourcc RADV
   fourcc vdva,dvca
+  fourcc dvau
   driver ffmpeg
   dll "dvaudio"
 
@@ -3347,6 +3360,7 @@ audiocodec ffmusepack8
   comment "only works with libavformat demuxer"
   status  working
   fourcc  "MPC8"
+  fourcc MPCK
   driver ffmpeg
   dll "mpc8"
 
-- 
cgit v1.2.3