# HG changeset patch
# User compn
# Date 1244774361 0
# Node ID e312750d3278d3ad77637ccf66d686c83e804796
# Parent  7a6f47f74e9bd2afd264340e2a82994d7546a643
sync with ffmpeg

diff -r 7a6f47f74e9b -r e312750d3278 etc/codecs.conf
--- a/etc/codecs.conf	Thu Jun 11 17:10:54 2009 +0000
+++ b/etc/codecs.conf	Fri Jun 12 02:39:21 2009 +0000
@@ -111,7 +111,11 @@
   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 @@
   fourcc AVmp
   fourcc VCR2
   fourcc mp2v,mpgv
+  fourcc m2v1
   fourcc PIM2
   fourcc LMP2 ; Lead mpeg2 in avi
   driver ffmpeg
@@ -192,6 +197,7 @@
   fourcc mx3n,mx3p
   fourcc AVmp
   fourcc mp2v,mpgv
+  fourcc m2v1
   fourcc LMP2 ; Lead mpeg2 in avi
   driver ffmpeg
   dll "mpegvideo"
@@ -230,6 +236,7 @@
   fourcc mx3n,mx3p
   fourcc AVmp
   fourcc mp2v,mpgv
+  fourcc m2v1
   fourcc LMP2 ; Lead mpeg2 in avi
   driver libmpeg2
 ;  dll "libmpeg2"
@@ -266,6 +273,7 @@
   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 @@
   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 @@
   status buggy
   format 0x706C6351 ; "Qclp"
   format 0x70637173 ; "sqcp"
+  format 0x716C6351 ; "Qclq"
   driver ffmpeg
   dll "qcelp"