summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorcompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-09-19 20:58:20 +0000
committercompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-09-19 20:58:20 +0000
commit4d1425c708ac2f2b9a74b2c17037f50aae554eea (patch)
tree0d94bcd247141025e594eedd62c6a5a198b3dcce /etc
parent04db08e9188faf366d9422abede62612aad97289 (diff)
downloadmpv-4d1425c708ac2f2b9a74b2c17037f50aae554eea.tar.bz2
mpv-4d1425c708ac2f2b9a74b2c17037f50aae554eea.tar.xz
sync with videolan
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27644 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf14
1 files changed, 14 insertions, 0 deletions
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"