summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorcompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2011-02-03 11:55:15 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2011-02-15 19:16:49 +0200
commit8aac9fae9b21945751c6575e02f6f0dd6dd6d09e (patch)
tree7b381ee01670ed9576df2aa7650b1edcdfe7df59 /etc
parentd037ba7331b6eabb9b78cf7b31d6916691b525f6 (diff)
downloadmpv-8aac9fae9b21945751c6575e02f6f0dd6dd6d09e.tar.bz2
mpv-8aac9fae9b21945751c6575e02f6f0dd6dd6d09e.tar.xz
codecs.conf: add apco, ap4h, ai55, ai15 fourccs
add apco and ap4h fourcc to prores decoder add ai55 and ai15 fourcc to h264 docoders git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32843 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf5
1 files changed, 5 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index be54e79035..261a9e0757 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -947,6 +947,7 @@ videocodec ffh264
fourcc avc1,AVC1
fourcc davc,DAVC
fourcc vvvc ; only one sample using this fourcc
+ fourcc ai55,ai15 ; flip4mac avc intra
format 0x10000005
driver ffmpeg
dll h264
@@ -959,6 +960,7 @@ videocodec ffh264vdpau
fourcc X264,x264
fourcc avc1,AVC1
fourcc davc,DAVC
+ fourcc ai55,ai15 ; flip4mac avc intra
format 0x10000005
driver ffmpeg
dll h264_vdpau
@@ -973,6 +975,7 @@ videocodec coreavcwindows
fourcc avc1 AVC1,AVC1
fourcc davc,DAVC
fourcc VSSH
+ fourcc ai55,ai15 ; flip4mac avc intra
format 0x10000005
driver dshow
dll "CoreAVCDecoder.ax"
@@ -2848,6 +2851,8 @@ videocodec qtprores
fourcc apch
fourcc apcn
fourcc apcs
+ fourcc apco
+ fourcc ap4h
driver qtvideo
dll "AppleProResDecoder.qtx"
out YUY2