diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/codecs.conf | 29 | ||||
| -rw-r--r-- | etc/input.conf | 12 | ||||
| -rw-r--r-- | etc/menu.conf | 2 |
3 files changed, 14 insertions, 29 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 152cd842b4..407696451b 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -3978,6 +3978,20 @@ audiocodec msadpcmacm driver acm dll "msadp32.acm" +audiocodec mp3 + info "mp3lib MPEG layer-2, layer-3" + status working + comment "Optimized to MMX/SSE/3Dnow!" + 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) + format 0x55005354 ; broken file + fourcc ".mp3" ; CBR/VBR MP3 (MOV files) + fourcc "MP3 " ; used in .nsv files + fourcc "LAME" ; used in mythtv .nuv files + driver mp3lib + audiocodec ffpcmdaud info "D-Cinema audio (FFmpeg)" status untested @@ -4062,26 +4076,11 @@ audiocodec ffmp2 comment "integer only" status working format 0x50 - format 0x5000736d ; "ms\0\x50" older mp2 fcc (MOV files) fourcc ".mp2" ; MP2 (MOV files) fourcc ".mp1" ; MP1 (MOV files) driver ffmpeg dll "mp2" -audiocodec mp3 - info "mp3lib MPEG layer-2, layer-3" - status working - comment "Optimized to MMX/SSE/3Dnow!" - 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) - format 0x55005354 ; broken file - fourcc ".mp3" ; CBR/VBR MP3 (MOV files) - fourcc "MP3 " ; used in .nsv files - fourcc "LAME" ; used in mythtv .nuv files - driver mp3lib - audiocodec mad info "libMAD MPEG layer 1-2-3" status working 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> - - |