[MPlayer-cvslog] r29356 - trunk/etc/codecs.conf

[compn]

Author: compn
Date: Fri Jun 12 04:39:21 2009
New Revision: 29356

Log:
sync with ffmpeg

Modified:
   trunk/etc/codecs.conf

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Thu Jun 11 19:10:54 2009	(r29355)
+++ trunk/etc/codecs.conf	Fri Jun 12 04:39:21 2009	(r29356)
@@ -111,7 +111,11 @@ videocodec mpegpes
   fourcc mx3n,mx3p
   fourcc AVmp
   fourcc mp2v,mpgv
+  fourcc m2v1
+  fourcc PIM1        ; Pinnacle hardware-MPEG-1
+  fourcc PIM2        ; Pinnacle hardware-MPEG-2
   fourcc VCR2
+  fourcc LMP2 ; Lead mpeg2 in avi
   driver mpegpes
   out MPES
 
@@ -154,6 +158,7 @@ videocodec ffmpeg2
   fourcc AVmp
   fourcc VCR2
   fourcc mp2v,mpgv
+  fourcc m2v1
   fourcc PIM2
   fourcc LMP2 ; Lead mpeg2 in avi
   driver ffmpeg
@@ -192,6 +197,7 @@ videocodec ffmpeg12
   fourcc mx3n,mx3p
   fourcc AVmp
   fourcc mp2v,mpgv
+  fourcc m2v1
   fourcc LMP2 ; Lead mpeg2 in avi
   driver ffmpeg
   dll "mpegvideo"
@@ -230,6 +236,7 @@ videocodec mpeg12
   fourcc mx3n,mx3p
   fourcc AVmp
   fourcc mp2v,mpgv
+  fourcc m2v1
   fourcc LMP2 ; Lead mpeg2 in avi
   driver libmpeg2
 ;  dll "libmpeg2"
@@ -266,6 +273,7 @@ videocodec ffmpeg12mc
   fourcc mx3n,mx3p
   fourcc AVmp
   fourcc mp2v,mpgv
+  fourcc m2v1
   fourcc LMP2 ; Lead mpeg2 in avi
   driver ffmpeg
   dll "mpegvideo_xvmc"
@@ -303,6 +311,7 @@ videocodec ffmpeg12vdpau
   fourcc AVmp
   fourcc mp2v,mpgv
   fourcc LMP2 ; Lead mpeg2 in avi
+  fourcc m2v1
   driver ffmpeg
   dll "mpegvideo_vdpau"
   out VDPAU_MPEG1
@@ -3048,6 +3057,7 @@ audiocodec ffqclp
   status buggy
   format 0x706C6351 ; "Qclp"
   format 0x70637173 ; "sqcp"
+  format 0x716C6351 ; "Qclq"
   driver ffmpeg
   dll "qcelp"