Mercurial > mplayer.hg

changeset 29317:75b178fa58aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sync with ffmpeg add m1v1 fourcc to mpeg1 codec add another format to ima wav adpcm from facebook samples
author compn
date Sat, 13 Jun 2009 12:32:05 +0000
parents 02b664c416bc
children 3c3406fa63a0
files etc/codecs.conf
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Fri Jun 12 14:23:21 2009 +0000
+++ b/etc/codecs.conf	Sat Jun 13 12:32:05 2009 +0000
@@ -111,7 +111,7 @@
   fourcc mx3n,mx3p
   fourcc AVmp
   fourcc mp2v,mpgv
-  fourcc m2v1
+  fourcc m2v1,m1v1
   fourcc PIM1        ; Pinnacle hardware-MPEG-1
   fourcc PIM2        ; Pinnacle hardware-MPEG-2
   fourcc VCR2
@@ -127,6 +127,7 @@
   fourcc PIM1        ; Pinnacle hardware-MPEG-1
   fourcc VCR2
   fourcc MPEG
+  fourcc m1v1
   driver ffmpeg
   dll "mpeg1video"
   out YV12,I420,IYUV
@@ -197,7 +198,7 @@
   fourcc mx3n,mx3p
   fourcc AVmp
   fourcc mp2v,mpgv
-  fourcc m2v1
+  fourcc m2v1,m1v1
   fourcc LMP2 ; Lead mpeg2 in avi
   driver ffmpeg
   dll "mpegvideo"
@@ -236,7 +237,7 @@
   fourcc mx3n,mx3p
   fourcc AVmp
   fourcc mp2v,mpgv
-  fourcc m2v1
+  fourcc m2v1,m1v1
   fourcc LMP2 ; Lead mpeg2 in avi
   driver libmpeg2
 ;  dll "libmpeg2"
@@ -273,7 +274,7 @@
   fourcc mx3n,mx3p
   fourcc AVmp
   fourcc mp2v,mpgv
-  fourcc m2v1
+  fourcc m2v1,m1v1
   fourcc LMP2 ; Lead mpeg2 in avi
   driver ffmpeg
   dll "mpegvideo_xvmc"
@@ -311,7 +312,7 @@
   fourcc AVmp
   fourcc mp2v,mpgv
   fourcc LMP2 ; Lead mpeg2 in avi
-  fourcc m2v1
+  fourcc m2v1,m1v1
   driver ffmpeg
   dll "mpegvideo_vdpau"
   out VDPAU_MPEG1
@@ -3286,6 +3287,7 @@
   status working
   format 0x11
   format 0x1100736d ; "ms\x00\x11" (MOV files)
+  format 0x11005354 ; "TS\x00\x11" (MOV files) works with -demuxer mov
   driver ffmpeg
   dll adpcm_ima_wav