3 files changed, 31 insertions, 46 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index fb0b9667a6..41bc50d559 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -112,37 +112,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"
@@ -343,6 +312,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
@@ -2119,7 +2118,7 @@ videocodec ffvp6a
 videocodec ffvp6f
   info "FFmpeg VP6 Flash"
   status working
-  fourcc VP6F
+  fourcc VP6F,FLV4
   driver ffmpeg
   dll "vp6f"
   out YV12
diff --git a/etc/input.conf b/etc/input.conf
index 8efa099002..3ed118018f 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -78,18 +78,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
diff --git a/etc/menu.conf b/etc/menu.conf
index 8aa273bcb7..635a2f2a1c 100644
--- a/etc/menu.conf
+++ b/etc/menu.conf
@@ -149,5 +149,3 @@
       <e name="Console" ok="set_menu console0"/>
       <e name="Quit" ok="quit"/>
 </cmdlist>
-
-