Mercurial > mplayer.hg

diff etc/codecs.conf @ 32756:1c12696d7af6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add apco and ap4h fourcc to prores decoder add ai55 and ai15 fourcc to h264 docoders
author compn
date Thu, 03 Feb 2011 11:55:15 +0000
parents cf80c8f31a1b
children fb6f8ea9d38a
line wrap: on
line diff
--- a/etc/codecs.conf	Wed Feb 02 23:55:16 2011 +0000
+++ b/etc/codecs.conf	Thu Feb 03 11:55:15 2011 +0000
@@ -986,6 +986,7 @@
   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
@@ -998,6 +999,7 @@
   fourcc X264,x264
   fourcc avc1,AVC1
   fourcc davc,DAVC
+  fourcc ai55,ai15 ; flip4mac avc intra
   format 0x10000005
   driver ffmpeg
   dll h264_vdpau
@@ -1012,6 +1014,7 @@
   fourcc avc1 AVC1,AVC1
   fourcc davc,DAVC
   fourcc VSSH
+  fourcc ai55,ai15 ; flip4mac avc intra
   format 0x10000005
   driver dshow
   dll "CoreAVCDecoder.ax"
@@ -2894,6 +2897,8 @@
   fourcc apch
   fourcc apcn
   fourcc apcs
+  fourcc apco
+  fourcc ap4h
   driver qtvideo
   dll "AppleProResDecoder.qtx"
   out YUY2