diff options
author | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-04-13 19:55:48 +0900 |
---|---|---|
committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-04-13 19:55:48 +0900 |
commit | 3287825bd2ee762a918961383604697358765397 (patch) | |
tree | d3513ec0b91a5c3832221c5b74225deb85fb2163 /input | |
parent | 9e65b5db0bf79b31c7816d1fdba77ea18fe82690 (diff) | |
parent | f43017bfe97c07aa73206d8d1388294cdbee628f (diff) | |
download | mpv-3287825bd2ee762a918961383604697358765397.tar.bz2 mpv-3287825bd2ee762a918961383604697358765397.tar.xz |
Merge branch 'master' into release/0.9
* master: (39 commits)
Update license headers
af_lavrresample: minor simplification
af_lavrresample: allow resetting output sample format
audio/filter: fully renegotiate audio formats on every reconfig
DOCS/waf: Edit --enable-feature sentences
vo_opengl: slightly simplify check_gl_features()
vo_opengl: unify blend-subtitles-res and blend-subtitles
vo_opengl: fix blend-subtitles-res=video & anamorphic video
manpage: mention how pseudo-gui mode is enabled on win32
main-fn-win: fix handle validity check for XP
win32: use pseudo-gui profile when started without stdio
win32: only attach to the console from mpv.com
win32: use a platform-specific unicode entry-point
vo_opengl: add blend-subtitles-res
manpage: document pseudo-gui stuff
mp_image: remove redundant flags field
mp_image: remove redundant chroma_x/y_shift fields
mp_image: remove redundant plane_w/h fields
player: use config parser for setting up pseudo-gui profile
player: change pseudo-gui settings
...
Diffstat (limited to 'input')
-rw-r--r-- | input/cmd_list.c | 9 | ||||
-rw-r--r-- | input/cmd_list.h | 9 | ||||
-rw-r--r-- | input/cmd_parse.c | 9 | ||||
-rw-r--r-- | input/cmd_parse.h | 10 | ||||
-rw-r--r-- | input/input.c | 9 | ||||
-rw-r--r-- | input/input.h | 9 | ||||
-rw-r--r-- | input/keycodes.c | 9 | ||||
-rw-r--r-- | input/keycodes.h | 9 |
8 files changed, 33 insertions, 40 deletions
diff --git a/input/cmd_list.c b/input/cmd_list.c index 2c502fd045..9005121985 100644 --- a/input/cmd_list.c +++ b/input/cmd_list.c @@ -1,19 +1,18 @@ /* - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * MPlayer is distributed in the hope that it will be useful, + * mpv is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see <http://www.gnu.org/licenses/>. */ #include <limits.h> diff --git a/input/cmd_list.h b/input/cmd_list.h index d57da46d06..52dc6426fa 100644 --- a/input/cmd_list.h +++ b/input/cmd_list.h @@ -1,19 +1,18 @@ /* - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * MPlayer is distributed in the hope that it will be useful, + * mpv is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see <http://www.gnu.org/licenses/>. */ #ifndef MP_COMMAND_LIST_H diff --git a/input/cmd_parse.c b/input/cmd_parse.c index 44d4c8a82b..f588bb7cf9 100644 --- a/input/cmd_parse.c +++ b/input/cmd_parse.c @@ -1,19 +1,18 @@ /* - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * MPlayer is distributed in the hope that it will be useful, + * mpv is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see <http://www.gnu.org/licenses/>. */ #include <stddef.h> diff --git a/input/cmd_parse.h b/input/cmd_parse.h index 6c4d100752..252dde4fac 100644 --- a/input/cmd_parse.h +++ b/input/cmd_parse.h @@ -1,20 +1,20 @@ /* - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * MPlayer is distributed in the hope that it will be useful, + * mpv is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see <http://www.gnu.org/licenses/>. */ + #ifndef MP_PARSE_COMMAND_H #define MP_PARSE_COMMAND_H diff --git a/input/input.c b/input/input.c index c12ed3abdb..2a108be1d2 100644 --- a/input/input.c +++ b/input/input.c @@ -1,19 +1,18 @@ /* - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * MPlayer is distributed in the hope that it will be useful, + * mpv is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see <http://www.gnu.org/licenses/>. */ #include "config.h" diff --git a/input/input.h b/input/input.h index c26273088f..d51492d4c7 100644 --- a/input/input.h +++ b/input/input.h @@ -1,19 +1,18 @@ /* - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * MPlayer is distributed in the hope that it will be useful, + * mpv is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see <http://www.gnu.org/licenses/>. */ #ifndef MPLAYER_INPUT_H diff --git a/input/keycodes.c b/input/keycodes.c index ce59bd7e9b..514bb22ff2 100644 --- a/input/keycodes.c +++ b/input/keycodes.c @@ -1,19 +1,18 @@ /* - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * MPlayer is distributed in the hope that it will be useful, + * mpv is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see <http://www.gnu.org/licenses/>. */ #include <stddef.h> diff --git a/input/keycodes.h b/input/keycodes.h index 44d71b3872..d95edb1f45 100644 --- a/input/keycodes.h +++ b/input/keycodes.h @@ -1,21 +1,20 @@ /* * KEY code definitions for keys/events not passed by ASCII value * - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * MPlayer is distributed in the hope that it will be useful, + * mpv is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see <http://www.gnu.org/licenses/>. */ #ifndef MPLAYER_KEYCODES_H |