summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorcompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-09-19 18:50:42 +0000
committercompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-09-19 18:50:42 +0000
commitd9d88dd59c5cd812874c7da3541ec38332b16b21 (patch)
treed74ed7b58d0bbc55f627cdd5ca4189644580c9b3 /etc
parent26b6a16cd59ca00245189aca7ff4d39b354f209a (diff)
downloadmpv-d9d88dd59c5cd812874c7da3541ec38332b16b21.tar.bz2
mpv-d9d88dd59c5cd812874c7da3541ec38332b16b21.tar.xz
sync with libavformat/isom.c fourcc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27641 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf45
1 files changed, 39 insertions, 6 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 4dc66c48ff..6b705721ae 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -85,7 +85,12 @@ videocodec mpegpes
fourcc xdv7,xdv8,xdv9
fourcc xdva,xdvb,xdvc
fourcc xdvd,xdve,xdvf
- fourcc xd5b
+ fourcc xd5a,xd5b,xd5c
+ fourcc xd5d.xd5e,xd5f
+ fourcc xd59
+ fourcc mx5n,mx5p,mx4n,mx4p
+ fourcc mx3n,mx3p
+ fourcc AVmp
driver mpegpes
out MPES
@@ -120,7 +125,12 @@ videocodec ffmpeg2
fourcc xdv7,xdv8,xdv9
fourcc xdva,xdvb,xdvc
fourcc xdvd,xdve,xdvf
- fourcc xd5b
+ fourcc xd5a,xd5b,xd5c
+ fourcc xd5d.xd5e,xd5f
+ fourcc xd59
+ fourcc mx5n,mx5p,mx4n,mx4p
+ fourcc mx3n,mx3p
+ fourcc AVmp
driver ffmpeg
dll "mpeg2video"
out YV12,I420,IYUV
@@ -149,7 +159,12 @@ videocodec ffmpeg12
fourcc xdv7,xdv8,xdv9
fourcc xdva,xdvb,xdvc
fourcc xdvd,xdve,xdvf
- fourcc xd5b
+ fourcc xd5a,xd5b,xd5c
+ fourcc xd5d.xd5e,xd5f
+ fourcc xd59
+ fourcc mx5n,mx5p,mx4n,mx4p
+ fourcc mx3n,mx3p
+ fourcc AVmp
driver ffmpeg
dll "mpegvideo"
out YV12,I420,IYUV
@@ -179,7 +194,12 @@ videocodec mpeg12
fourcc xdv7,xdv8,xdv9
fourcc xdva,xdvb,xdvc
fourcc xdvd,xdve,xdvf
- fourcc xd5b
+ fourcc xd5a,xd5b,xd5c
+ fourcc xd5d.xd5e,xd5f
+ fourcc xd59
+ fourcc mx5n,mx5p,mx4n,mx4p
+ fourcc mx3n,mx3p
+ fourcc AVmp
driver libmpeg2
; dll "libmpeg2"
out YV12,I420,IYUV
@@ -207,7 +227,12 @@ videocodec ffmpeg12mc
fourcc xdv7,xdv8,xdv9
fourcc xdva,xdvb,xdvc
fourcc xdvd,xdve,xdvf
- fourcc xd5b
+ fourcc xd5a,xd5b,xd5c
+ fourcc xd5d.xd5e,xd5f
+ fourcc xd59
+ fourcc mx5n,mx5p,mx4n,mx4p
+ fourcc mx3n,mx3p
+ fourcc AVmp
driver ffmpeg
dll "mpegvideo_xvmc"
out IDCT_MPEG2
@@ -1086,6 +1111,7 @@ videocodec m3jpeg2k
info "Morgan MJPEG2000"
status working
fourcc MJ2C
+ fourcc MJP2
driver vfw
dll "m3jp2k32.dll"
out YV12,I420,IYUV
@@ -1340,6 +1366,9 @@ videocodec ffdv
fourcc dv50 ; DVCPRO 50
fourcc dv5n ; DVCPRO 50 NTSC in .mov
fourcc dv5p ; DVCPRO 50 PAL in .mov
+ fourcc AVdv,AVd1
+ fourcc dvhq,dvhp
+ fourcc dvh5,dvh6,dvh3
driver ffmpeg
dll dvvideo
out 411P,422P,YV12
@@ -1355,7 +1384,9 @@ videocodec libdv
fourcc dv50 ; DVCPRO 50
fourcc dv5n ; DVCPRO 50 NTSC in .mov
fourcc dv5p ; DVCPRO 50 PAL in .mov
- fourcc AVdv ; AVID DV
+ fourcc AVdv,AVd1 ; AVID DV
+ fourcc dvhq,dvhp
+ fourcc dvh5,dvh6,dvh3
driver libdv
dll libdv.so.2
out YUY2
@@ -1889,6 +1920,7 @@ videocodec ffcavs
comment "only works with libavformat demuxer"
status working
fourcc CAVS
+ fourcc avs2
driver ffmpeg
dll "cavs"
out I420
@@ -2971,6 +3003,7 @@ audiocodec ffdv
info "FFmpeg DV audio decoder"
status working
fourcc RADV
+ fourcc vdva,dvca
driver ffmpeg
dll "dvaudio"