diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/encoding-example-profiles.conf | 10 | ||||
| -rw-r--r-- | etc/input.conf | 17 |
2 files changed, 9 insertions, 18 deletions
diff --git a/etc/encoding-example-profiles.conf b/etc/encoding-example-profiles.conf index d05adab9a1..890cbc0067 100644 --- a/etc/encoding-example-profiles.conf +++ b/etc/encoding-example-profiles.conf @@ -53,7 +53,7 @@ oacopts = b=128k [enc-a-vorbis] profile-desc = "Vorbis (libvorbis)" -oac = libvorbis +oac = libvorbis,vorbis oacopts = qscale=3 ################ @@ -152,12 +152,14 @@ profile-desc = "MP4 for Blackberry Bold 9000" profile = enc-f-mp4 vf-add = dsize=480:360:0:2,scale=w=0:h=0,dsize=-1:-1 # native screen res, letterbox ovcopts-add = maxrate=1500k,bufsize=1000k,rc_init_occupancy=900k,refs=1,profile=baseline +vf-add=noformat=444p,noformat=444p9,noformat=444p10,noformat=422p,noformat=422p9,noformat=422p10 [enc-to-nok-n900] profile-desc = "MP4 for Nokia N900" profile = enc-f-mp4 -vf-add = dsize=800:480:0:2,scale=w=0:h=0,dsize=-1:-1 # native screen res, letterbox -ovcopts-add = profile=baseline,level=30 +vf-add = dsize=800:480:0:2,scale=w=0:h=0:noup=1,scale=w=-1:h=-2:noup=1,scale=w=-2:h=-1:noup=1,dsize=-1:-1 # native screen res, letterbox +ovcopts-add = profile=baseline,level=30,maxrate=10000k,bufsize=10000k,rc_init_occupancy=9000k,refs=5 +vf-add=noformat=444p,noformat=444p9,noformat=444p10,noformat=422p,noformat=422p9,noformat=422p10 [enc-to-nok-6300] profile-desc = "3GP for Nokia 6300" @@ -176,12 +178,14 @@ vf-add = scale=w=480:h=272,dsize=480:270 srate = 48000 channels = 2 ovcopts-add = b=512k,profile=baseline +vf-add=noformat=444p,noformat=444p9,noformat=444p10,noformat=422p,noformat=422p9,noformat=422p10 [enc-to-iphone-noscale] profile-desc = "MP4 for iPhone (no scaling)" profile = enc-f-mp4 oautofps = yes # iphone supports 30fps max ovcopts-add = maxrate=2500k,bufsize=1000k,rc_init_occupancy=900k,level=30,profile=baseline +vf-add=noformat=444p,noformat=444p9,noformat=444p10,noformat=422p,noformat=422p9,noformat=422p10 [enc-to-iphone] profile-desc = "MP4 for iPhone (480x320)" diff --git a/etc/input.conf b/etc/input.conf index ed10a71684..300f20c307 100644 --- a/etc/input.conf +++ b/etc/input.conf @@ -27,6 +27,7 @@ # key combinations is only supported through the video windows of certain # output drivers (not in output windows of other drivers or in a terminal). +MOUSE_BTN0 ignore # don't do anything MOUSE_BTN0_DBL cycle fullscreen # toggle fullscreen on/off MOUSE_BTN2 cycle pause # toggle pause on/off MOUSE_BTN3 seek 10 @@ -59,6 +60,7 @@ q {encode} quit ESC quit p cycle pause # toggle pause/playback mode . frame_step # advance one frame and pause +, frame_back_step # go back by one frame and pause SPACE cycle pause > playlist_next # skip to next file ENTER playlist_next force # skip to next file or quit @@ -134,21 +136,6 @@ n tv_step_norm u tv_step_chanlist # -# Apple Remote section -# - -AR_PLAY cycle pause -AR_PLAY_HOLD quit -AR_NEXT seek 30 -AR_NEXT_HOLD seek 120 -AR_PREV seek -10 -AR_PREV_HOLD seek -120 -AR_MENU cycle osd -AR_MENU_HOLD cycle mute -AR_VUP add volume 1 -AR_VDOWN add volume -1 - -# # Joystick section # WARNING: joystick support has to be explicitly enabled at # compiletime with --enable-joystick |