summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf95
-rw-r--r--etc/input.conf12
2 files changed, 47 insertions, 60 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 5964c487b0..d8773bda29 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -124,37 +124,6 @@ videocodec blackmagic
out BGR32,RGB32
; MPEG-1/2 decoding:
-; Note: mpegpes is preferred for hw decoders:
-
-videocodec mpegpes
- info "MPEG-PES output (.mpg or DXR3/IVTV/DVB/V4L2 card)"
- comment "for hardware decoding"
- status working
- format 0x10000001 ; mpeg 1
- 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
- fourcc xdv7,xdv8,xdv9
- fourcc xdva,xdvb,xdvc
- fourcc xdvd,xdve,xdvf
- fourcc xd5a,xd5b,xd5c
- fourcc xd5d,xd5e,xd5f
- fourcc xd59
- fourcc mx5n,mx4n,mx4p
- fourcc mx3n,mx3p
- fourcc AVmp
- fourcc mp2v,mpgv
- fourcc m2v1,m1v1
- fourcc PIM1 ; Pinnacle hardware-MPEG-1
- fourcc PIM2 ; Pinnacle hardware-MPEG-2
- fourcc LMP2 ; Lead mpeg2 in avi
- driver mpegpes
- out MPES
videocodec ffmpeg1
info "FFmpeg MPEG-1"
@@ -355,6 +324,36 @@ videocodec ffmpeg12vdpau
out VDPAU_MPEG1
out VDPAU_MPEG2
+videocodec mpegpes
+ info "MPEG-PES output (.mpg or DXR3/IVTV/DVB/V4L2 card)"
+ comment "for hardware decoding"
+ status working
+ format 0x10000001 ; mpeg 1
+ 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
+ fourcc xdv7,xdv8,xdv9
+ fourcc xdva,xdvb,xdvc
+ fourcc xdvd,xdve,xdvf
+ fourcc xd5a,xd5b,xd5c
+ fourcc xd5d,xd5e,xd5f
+ fourcc xd59
+ fourcc mx5n,mx4n,mx4p
+ fourcc mx3n,mx3p
+ fourcc AVmp
+ fourcc mp2v,mpgv
+ fourcc m2v1,m1v1
+ fourcc PIM1 ; Pinnacle hardware-MPEG-1
+ fourcc PIM2 ; Pinnacle hardware-MPEG-2
+ fourcc LMP2 ; Lead mpeg2 in avi
+ driver mpegpes
+ out MPES
+
; we have only native open source codecs for these:
videocodec ffnuv
@@ -2131,7 +2130,7 @@ videocodec ffvp6a
videocodec ffvp6f
info "FFmpeg VP6 Flash"
status working
- fourcc VP6F
+ fourcc VP6F,FLV4
driver ffmpeg
dll "vp6f"
out YV12
@@ -3902,6 +3901,22 @@ audiocodec ffdv
driver ffmpeg
dll "dvaudio"
+audiocodec faad
+ info "FAAD AAC (MPEG-2/MPEG-4 Audio)"
+ status working
+ fourcc mp4a,MP4A
+ fourcc "VLB " ; Used in NSV, not really working
+ fourcc "AAC " ; Used in NSV
+ fourcc "AACP" ; Used in NSV for AACPlus
+ fourcc raac,racp
+ format 0xff
+ format 0x706D
+ format 0x4143 ; aac in asf
+ format 0xA106 ; aac in avi
+ format 0xAAC0 ; Borgtech nonsense tag
+ driver faad
+ dll libfaad2
+
audiocodec ffaac
info "FFmpeg AAC (MPEG-2/MPEG-4 Audio)"
comment "missing LATM support, some SBR in MKV play too slow"
@@ -3991,22 +4006,6 @@ audiocodec ffnellymoser
driver ffmpeg
dll "nellymoser"
-audiocodec faad
- info "FAAD AAC (MPEG-2/MPEG-4 Audio)"
- status working
- fourcc mp4a,MP4A
- fourcc "VLB " ; Used in NSV, not really working
- fourcc "AAC " ; Used in NSV
- fourcc "AACP" ; Used in NSV for AACPlus
- fourcc raac,racp
- format 0xff
- format 0x706D
- format 0x4143 ; aac in asf
- format 0xA106 ; aac in avi
- format 0xAAC0 ; Borgtech nonsense tag
- driver faad
- dll libfaad2
-
audiocodec pcm
info "Uncompressed PCM"
status working
diff --git a/etc/input.conf b/etc/input.conf
index c7540886da..0bcfdec9f7 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -79,18 +79,6 @@ n tv_step_norm
b tv_step_chanlist
##
-## GUI
-##
-
-#l gui_loadfile
-#t gui_loadsubtitle
-#a gui_about
-#s gui_stop
-#p gui_playlist
-#r gui_preferences
-#c gui_skinbrowser
-
-##
## Joystick section
## WARNING: joystick support has to be explicitly enabled at
## compiletime with --enable-joystick