1 files changed, 33 insertions, 3 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 83348738e2..1786822d62 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -144,6 +144,7 @@ videocodec ffmpeg2
   fourcc AVmp
   fourcc VCR2
   fourcc mp2v,mpgv
+  fourcc PIM2
   driver ffmpeg
   dll "mpeg2video"
   out YV12,I420,IYUV
@@ -157,6 +158,7 @@ videocodec ffmpeg12
   format 0x10000002  ; MPEG-2
   fourcc mpg1,mpg2,MPG2
   fourcc PIM1        ; Pinnacle hardware-MPEG-1
+  fourcc PIM2        ; Pinnacle hardware-MPEG-2
   fourcc VCR2
   fourcc "DVR "
   fourcc hdv2
@@ -194,6 +196,7 @@ videocodec mpeg12
   fourcc hdv2
   fourcc mpg1
   fourcc PIM1        ; Pinnacle hardware-MPEG-1
+  fourcc PIM2        ; Pinnacle hardware-MPEG-2
   fourcc VCR2
   fourcc mpg2,MPG2
   fourcc MPEG
@@ -230,6 +233,7 @@ videocodec ffmpeg12mc
   fourcc hdv1
   fourcc hdv2
   fourcc PIM1        ; Pinnacle hardware-MPEG-1
+  fourcc PIM2        ; Pinnacle hardware-MPEG-2
   fourcc VCR2
   fourcc MPEG
   fourcc hdv3        ; HDV 1080i50
@@ -671,7 +675,7 @@ videocodec ffindeo2
 videocodec ffflv
   info "FFmpeg Flash video"
   status working
-  fourcc FLV1
+  fourcc FLV1,flv
   driver ffmpeg
   dll flv
   out YV12
@@ -713,6 +717,7 @@ videocodec ffmp41
   status working
   fourcc DIV1,div1 mpg4
   fourcc MPG4,mpg4
+  fourcc MP41
   driver ffmpeg
   dll msmpeg4v1
   out YV12,I420,IYUV
@@ -793,6 +798,9 @@ videocodec ffodivx
   fourcc m4cc,M4CC
   fourcc hdx4,HDX4
   fourcc FVFW,fvfw
+  fourcc FFDS
+  fourcc DCOD,MVXM,EM4A,PM4V
+  fourcc M4T3
   driver ffmpeg
   dll mpeg4 ;opendivx
   out YV12,I420,IYUV
@@ -840,6 +848,9 @@ videocodec xvid
   fourcc SEDG ; diskless camcorder Samsung Miniket VP-M110
   fourcc SMP4,smp4 ; Samsung SMP4 video codec
   fourcc VIDM ; vidm 4.01 codec
+  fourcc FFDS
+  fourcc DCOD,MVXM,EM4A,PM4V
+  fourcc M4T3
   format 0x10000004  ; mpeg 4 es
   driver xvid
   out YV12
@@ -1042,6 +1053,7 @@ videocodec ffmjpeg
   fourcc LJPG       ; lossless JPEG
   fourcc dmb1       ; MJPEG by Matrox Rainbow Runner
   fourcc MJLS       ; JPEG-LS custom FOURCC for avi - encoder
+  fourcc MMJP
   driver ffmpeg
   dll mjpeg
   out 444P
@@ -1848,6 +1860,15 @@ videocodec tm20
   guid 0x4cb63e61, 0xc611, 0x11D0, 0x83, 0xaa, 0x00, 0x00, 0x92, 0x90, 0x01, 0x84
   out BGR32,BGR24,BGR16 flip
 
+videocodec sif1
+  info "sif1 alpha4"
+  status working
+  fourcc SIF1
+  driver dshow
+  dll "Sif1Dec.ax"
+  guid 0x31666973, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71
+  out BGR32
+
 videocodec ffamv
   info "Modified MJPEG, used in AMV files"
   status working
@@ -1872,6 +1893,14 @@ videocodec sp5x
   dll "sp5x_32.dll"
   out BGR24,BGR15 flip
 
+videocodec bt411
+  info "Brooktree 411 codec"
+  status working
+  fourcc BT20,Y41P
+  driver vfwex
+  dll "btvvc32.drv"
+  out BGR24
+
 videocodec vivd2
   info "SoftMedia ViVD V2 codec VfW"
   status working
@@ -1908,10 +1937,10 @@ videocodec wnv1
 videocodec vdom
   info "VDOWave codec"
   status working
-  fourcc VDOM
+  fourcc VDOM,VDOW
   driver vfw
   dll "vdowave.drv" ; Need also VDODEC32.dll and DECVW_32.DLL
-  out BGR24
+  out BGR24 flip
 
 videocodec lsv
   info "Vianet Lsvx Video Decoder"
@@ -3173,6 +3202,7 @@ audiocodec mp3
   format 0x50        ; layer-1 && layer-2
   format 0x55        ; layer-3
   format 0x5500736d  ; "ms\0\x55" older mp3 fcc (MOV files)
+  format 0x5000736d  ; "ms\0\x50" older mp2 fcc (MOV files)
   fourcc ".mp3"      ; CBR/VBR MP3 (MOV files)
   fourcc "MP3 "      ; used in .nsv files
   fourcc "LAME"      ; used in mythtv .nuv files