summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ass_mp.c: remove code duplicationwm42012-03-061-2/+1
* Merge remote-tracking branch 'origin/master' into my_masterwm42012-03-0566-2099/+387
|\
| * aviheader.c: silence a warningUoti Urpala2012-02-291-2/+4
| * vo_png: set AVCodecContext parameters before opening itUoti Urpala2012-02-281-19/+21
| * configure: remove obsolete messages for mtrr / no w32codecsUoti Urpala2012-02-281-28/+1
| * vo: reject vo_redraw_frame() if no frames have been drawnUoti Urpala2012-02-282-1/+4
| * configure, build: support compiling without libpostprocUoti Urpala2012-02-275-6/+26
| * configure, ao_alsa: drop support for obsolete ALSA versionsUoti Urpala2012-02-276-695/+11
| * configure: simplify pkg-config handling, drop other testsUoti Urpala2012-02-271-201/+46
| * demux_lavf: update growing file size info for AVSEEK_SIZEUoti Urpala2012-02-261-2/+5
| * osd: erase terminal OSD line with mp_msg() instead of printf()Uoti Urpala2012-02-251-1/+1
| * screenshot: fix libav API use (pix_fmt and some other things)wm42012-02-251-8/+13
| * vd_ffmpeg: fix flushing of buffered framesUoti Urpala2012-02-032-5/+12
| * vd_ffmpeg: adjust buffered frame count based on threads againUoti Urpala2012-02-031-0/+2
| * build: switch to libavutil bswap.h and intreadwrite.hUoti Urpala2012-02-0137-642/+113
| * demux_lavf: use Libav RIFF tag lists directlyUoti Urpala2012-02-015-400/+47
| * Update Libav API usesUoti Urpala2012-02-0118-102/+96
* | screenshot: don't convert image if it's already in required formatwm42012-02-291-17/+27
* | screenshot: move code to open file out of image writer functionswm42012-02-291-29/+16
* | screenshot: make screenshot filenames configurablewm42012-02-295-31/+225
* | screenshot: allow forcing taking screenshots with the video filterwm42012-02-293-2/+29
* | core: rename --paused to --pause, and improve how pausing is donewm42012-02-292-2/+2
* | struct stat.st_blocks is not available on MinGWwm42012-02-281-4/+4
* | cue: play .bin files as raw PCM audio (even if it means playing noise)wm42012-02-261-0/+14
* | core: sort chapterswm42012-02-261-1/+26
* | Fix minor memory leak from 2003wm42012-02-251-2/+8
* | input: restore terminal attributes after resumewm42012-02-251-6/+21
* | osd: clear terminal OSD line with mp_msg() instead of printfwm42012-02-251-1/+1
* | mpcodecs: remove mp_image_t.x/ywm42012-02-249-25/+19
* | x11: fix crash when using switch_video (broken by UTF-8 input changes)wm42012-02-241-0/+1
* | Merge remote-tracking branch 'origin/master' into my_masterwm42012-02-192-2/+2
|\|
| * Update copyright yearUoti Urpala2012-01-282-2/+2
* | stream: refuse to open directorieswm42012-02-191-0/+9
* | Don't print awkward negative seek message when playing directorywm42012-02-191-1/+0
* | input: fix "enter" on consolewm42012-02-191-8/+9
* | screenshot: fix error messagewm42012-02-191-1/+1
* | input: fix OSD cyclingwm42012-02-121-1/+1
* | commands: add pt_clear command to clear playlistwm42012-02-103-0/+29
* | bstr: add bstr_eatstart()wm42012-02-092-0/+11
* | vo_gl: add "backend" suboption to allow selecting the GUI backendwm42012-02-094-35/+54
* | vo_gl: minor cleanupsreimar2012-02-093-22/+20
* | vo_gl: add noise filterreimar2012-02-094-13/+84
* | core: add option to start in paused statewm42012-02-093-0/+7
* | i lost my brainwm42012-01-261-1/+1
* | input.c: simplify command definitionswm42012-01-262-129/+130
* | x11: fix setting UTF-8 window titles for some special caseswm42012-01-251-9/+15
* | screenshot: add png compression settingwm42012-01-184-1/+4
* | screenshot: add jpg supportwm42012-01-184-12/+122
* | osd: add setting to display OSD always on terminalwm42012-01-184-12/+27
* | options: allow choice options without parameterwm42012-01-182-8/+20
* | core: add new support for reading .cue fileswm42012-01-187-0/+497
* | bstr: add some utility functionswm42012-01-182-0/+58
* | Merge branch 'gradfun' into my_masterwm42012-01-181-9/+47
|\ \
| * | vf_gradfun: change default parameterswm42012-01-101-2/+2
| * | vf_gradfun: add size parameter, which sets radius according to movie diagonalwm42012-01-101-2/+23
| * | vf_gradfun: use option parserwm42012-01-101-9/+26
* | | Merge branch 'eosd' into my_masterwm42012-01-187-346/+504
|\ \ \
| * | | vo_gl: use generic eosd codewm42011-12-253-145/+124
| * | | libvo, vo_vdpau: make the EOSD packer code from vo_vdpau genericwm42011-12-254-201/+380
| |/ /
* | | Merge branch 'softvol' into my_masterwm42012-01-1815-211/+413
|\ \ \
| * | | ao_coreaudio: fix partial volume controlwm42012-01-181-1/+5
| * | | ao_pulse: add mute controlwm42012-01-181-18/+37
| * | | ao_alsa: add mute controlwm42012-01-181-23/+43
| * | | ao_alsa: use "Master" mixer channel instead of "PCM" by defaultwm42012-01-181-1/+1
| * | | mixer, libao: add proper mute controlwm42012-01-183-23/+65
| * | | libao2: try to identify some audio outputs that have persistent volumewm42012-01-185-0/+9
| * | | af: fix crash when trying to use volume controls with AC3 pass-throughwm42012-01-181-1/+8
| * | | core: remove EDL mutingwm42012-01-183-44/+1
| * | | audio: reset mplayer's mute state when the system mixer volume changeswm42012-01-183-9/+26
| * | | audio: pretend muting doesn't set volume to 0wm42012-01-181-18/+30
| * | | audio: properly restore audio volume on exit when mute is usedwm42012-01-184-13/+42
| * | | ao_coreaudio: signal that volume controls are not persistentwm42012-01-181-0/+2
| * | | mixer: restore volume with audio output drivers without persistent volumewm42012-01-183-20/+35
| * | | softvol: make sure softvol settings are restored when switching audio trackswm42012-01-181-1/+1
| * | | audio: fix crash when exiting file when mute is enabledwm42012-01-181-0/+1
| * | | af: print audio filter chain in verbose modewm42012-01-181-0/+35
| * | | mixer: keep balance settingwm42012-01-072-0/+8
| * | | mixer: keep user volume setting when --softvol is usedwm42012-01-073-0/+17
| * | | mixer: reindent/cosmetic changeswm42011-12-262-111/+119
| |/ /
* | | Merge branch 'utf8_input' into my_masterwm42012-01-1811-259/+327
|\ \ \
| * | | etc/input.conf: make file contents match default key bindingswm42012-01-181-98/+143
| * | | x11: remove wskeys.hwm42012-01-182-107/+20
| * | | x11: add print and menu keyswm42012-01-183-0/+3
| * | | x11: add KP_Separator to key mappingwm42012-01-182-0/+2
| * | | input: handle UTF-8 terminal inputwm42012-01-181-0/+10
| * | | x11: allow unicode inputwm42012-01-182-29/+48
| * | | input: allow unicode keys and reassign internal key codeswm42012-01-185-27/+58
| * | | bstr: add function for UTF-8 parsing (taken from libav)wm42012-01-142-0/+45
| |/ /
* | | Merge remote-tracking branch 'origin/master' into my_masterwm42012-01-1824-303/+205
|\ \ \ | | |/ | |/|
| * | vd_ffmpeg: explicitly set thread count even if 1Uoti Urpala2012-01-171-2/+1
| * | stream_vcd: fix option value allocated with strdupUoti Urpala2012-01-161-2/+4
| * | audio: change default preference order of AO driverswm42012-01-161-8/+8
| * | af_volume: do not change data when volume is 1wm42012-01-161-5/+4
| * | core: print pause status message only once on consolewm42012-01-102-31/+58
| * | osd: always display pause icon when frame steppingwm42012-01-092-2/+3
| * | cleanup: remove left over access_mpcontext.h (from GUI)Uoti Urpala2012-01-092-61/+0
| * | ad_ffmpeg: pass packet side data from libavformatUoti Urpala2012-01-084-18/+32
| * | vf_fspp: make compile without Libav internalsUoti Urpala2012-01-023-11/+9
| * | stream_ffmpeg: switch to libavformat avio APIUoti Urpala2012-01-021-19/+31
| * | Libav API updates (remove most deprecated-in-0.7 uses)Uoti Urpala2011-12-223-42/+22
| * | configure, build: require at least Libav 0.7Uoti Urpala2011-12-2212-78/+7
| * | vo_vdpau: fix preemption recovery after recent commitsUoti Urpala2011-12-201-25/+27
| |/
* | screenshot: improve quality by using additional swscale flagswm42012-01-183-8/+20
* | x11: simplify setting unicode text propertieswm42012-01-181-22/+6
* | playtree: --shuffle shouldn't make playlist navigation uselesswm42012-01-181-0/+54
* | subtitles: create only one instance of ASS_Render instead of twowm42012-01-182-57/+30
* | input: simplify previous commit a bit morewm42012-01-181-20/+20
* | input: fix crashes with libmenuwm42012-01-182-17/+33
* | core: uninit video output when audio file is playedwm42011-12-231-1/+4
* | mplayer: remove ---help optionwm42011-12-231-1/+0
* | matroska: speed up ordered chapters scanning with improved heuristicswm42011-12-231-13/+38
|/
* vf_expand: always clear the added borderswm42011-12-191-93/+20
* vf_dsize, vf_scale: fix behavior on multiple config() callswm42011-12-192-19/+26
* vf_dsize: cleanup identation (tabs to 4 spaces)wm42011-12-191-71/+71
* vo: reset EOSD change detection when VO is re-configuredwm42011-12-121-0/+3
* configure, build: remove --disable-libav supportUoti Urpala2011-12-1116-97/+24
* vo_vdpau: use new want_redraw mechanism in one more caseUoti Urpala2011-12-091-3/+1
* options: change --ass-hinting default to 0Uoti Urpala2011-12-071-1/+0
* Merge remote-tracking branch 'pigoz/gl'Uoti Urpala2011-12-073-13/+27
|\
| * vo_gl: cocoa: point swapinterval to cocoa_common functionStefano Pigozzi2011-12-063-0/+11
| * vo_gl: cocoa: decouple cocoa_common from gl_commonStefano Pigozzi2011-12-063-13/+16
* | Merge remote-tracking branch 'wm4/window_title'Uoti Urpala2011-12-0715-62/+107
|\|
| * libvo: change default window title to "mplayer2"wm42011-12-062-2/+2
| * x11: set window titles as UTF-8wm42011-12-062-3/+58
| * libvo: remove title argument from struct vo_driver.configwm42011-12-0615-60/+50
* | ad_ffmpeg: avoid avcodec_close() if avcodec_open() failedUoti Urpala2011-12-061-1/+1
* | core: minor hrseek tweak (affects vo_vdpau deint frames)Uoti Urpala2011-12-061-3/+2
* | commands: playback speed: better responsiveness without audioUoti Urpala2011-12-061-3/+5
* | core, vo: new window refresh logic, add slow-video OSD redrawUoti Urpala2011-12-066-74/+35
* | core, vo: modify OSD redraw architecture, support EOSDUoti Urpala2011-12-0614-63/+66
* | vo: do final frame draw only near page flipUoti Urpala2011-12-064-12/+51
|/
* vo_gl: add native mac osx Cocoa backend for vo_glStefano Pigozzi2011-11-266-1/+660
* vo_corevideo: fix key interpretation with modifiersStefano Pigozzi2011-11-261-2/+9
* vo_gl: fix cscale=4 and cscale=5 doing nothingwm42011-11-251-2/+4
* vo_gl: fix 10 bit with Mesa drivers (Intel/Nouveau on Linux)wm42011-11-253-8/+18
* vo_gl: make shader code generation easier to deal withwm42011-11-251-152/+188
* Merge branch 'screenshot' (early part)Uoti Urpala2011-11-2519-172/+613
|\
| * vo_xv: implement screenshotswm42011-11-251-0/+51
| * vo_gl: implement screenshotswm42011-11-253-0/+80
| * vo_vdpau: implement screenshotswm42011-11-253-11/+91
| * video: use talloc for mp_image, abort if out of memorywm42011-11-251-14/+20
| * core: add screenshot mode for actual VO window contentswm42011-11-256-11/+32
| * core: add infrastructure to get screenshots from VOswm42011-11-259-144/+347
* | ao_coreaudio: fix crash when using mute with S/PDIF outputreimar2011-11-251-1/+4
* | ao_coreaudio: fix S/PDIF output on OS X 10.7Zongyao Qu2011-11-251-37/+50
* | commands, vd_ffmpeg: fix switch_ratio slave commandUoti Urpala2011-11-145-35/+48