summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf12
1 files changed, 11 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 0541315108..cd00c4d210 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -77,6 +77,8 @@ videocodec mpegpes
format 0x10000002 ; mpeg 2
fourcc mpg1,MPG1,mpg2,MPG2
fourcc MPEG
+ fourcc hdv1,hdv2,hdv3
+ fourcc hdv5
fourcc hdv6,hdv7,hdv8
fourcc xdv1,xdv2,xdv3
fourcc xdv4,xdv5,xdv6
@@ -104,6 +106,7 @@ videocodec ffmpeg2
format 0x10000002 ; MPEG-2
fourcc mpg2,MPG2
fourcc "DVR "
+ fourcc hdv1
fourcc hdv2
fourcc MPEG
fourcc hdv3 ; HDV 1080i50
@@ -133,6 +136,7 @@ videocodec ffmpeg12
fourcc "DVR "
fourcc hdv2
fourcc MPEG
+ fourcc hdv1
fourcc hdv3 ; HDV 1080i50
fourcc hdv5 ; HDV 720p25
fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s)
@@ -161,6 +165,7 @@ videocodec mpeg12
fourcc VCR2
fourcc mpg2,MPG2
fourcc MPEG
+ fourcc hdv1
fourcc hdv3 ; HDV 1080i50
fourcc hdv5 ; HDV 720p25
fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s)
@@ -183,6 +188,7 @@ videocodec ffmpeg12mc
format 0x10000002 ; MPEG-2
fourcc mpg1,mpg2,MPG2
fourcc "DVR "
+ fourcc hdv1
fourcc hdv2
fourcc PIM1 ; Pinnacle hardware-MPEG-1
fourcc VCR2
@@ -594,6 +600,7 @@ videocodec ffvixl
status working
fourcc VIXL
fourcc PIXL ; this is Pinnacle one
+ fourcc XIXL
driver ffmpeg
dll xl
out 411P
@@ -974,6 +981,7 @@ videocodec ffmjpeg
status working
fourcc MJPG,mjpg
fourcc AVRn,AVDJ ; AVID
+ fourcc ADJV ; Avid Motion JPEG
fourcc jpeg ; MOV Photo-JPEG
fourcc mjpa ; Apple MJPEG-A (Quicktime)
fourcc JFIF ; SMJPEG (Loki)
@@ -1170,7 +1178,9 @@ videocodec ffh263
status working
fourcc H263,U263,h263,X263,M263
fourcc viv1 h263
- fourcc s263
+ fourcc s263,S263
+ fourcc D263 ; DEC H263
+ fourcc L263 ; Lead H263
driver ffmpeg
dll h263
out YV12,I420,IYUV