Mercurial > mplayer.hg

diff etc/codecs.conf @ 34105:34c1bbba61a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
The GPL'd ProRes decoder from FFmpeg has been LGPL'd and renamed to 'prores'.
author cehoyos
date Wed, 12 Oct 2011 22:32:45 +0000
parents 6e0b0e414ac9
children 6af39671370d
line wrap: on
line diff
--- a/etc/codecs.conf	Wed Oct 12 22:04:12 2011 +0000
+++ b/etc/codecs.conf	Wed Oct 12 22:32:45 2011 +0000
@@ -3119,30 +3119,6 @@
   dll "AppleProResDecoder.qtx"
   out YUY2
 
-videocodec ffproreslgpl
-  info "FFmpeg ProRes, LGPL"
-  status working
-  fourcc apch
-  fourcc apcn
-  fourcc apcs
-  fourcc apco
-  fourcc ap4h
-  driver ffmpeg
-  dll prores_lgpl
-  out 422P10,444P10
-
-videocodec ffproresgpl
-  info "FFmpeg ProRes, GPL v2 only"
-  status working
-  fourcc apch
-  fourcc apcn
-  fourcc apcs
-  fourcc apco
-  fourcc ap4h
-  driver ffmpeg
-  dll prores_gpl
-  out 422P10,444P10
-
 videocodec ffprores
   info "FFmpeg Apple ProRes"
   status working
@@ -3155,6 +3131,18 @@
   dll prores
   out 422P10,444P10
 
+videocodec ffproreslgpl
+  info "Libav ProRes"
+  status working
+  fourcc apch
+  fourcc apcn
+  fourcc apcs
+  fourcc apco
+  fourcc ap4h
+  driver ffmpeg
+  dll prores_lgpl
+  out 422P10,444P10
+
 ; VSS codecs (http://vsofts.com/solutions.html):
 
 videocodec vsslight