RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

player: change license of some code surrounding --frames to LGPL 

The original author of the patch has agreed now.
This commit is contained in:
wm4 2017-11-06 20:53:27 +01:00
parent 921073bf86
commit a2a623ebb9
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Copyright
View File

@ -43,7 +43,6 @@ them quite central:
- many builtin video filters (use libavfilter instead) - many builtin video filters (use libavfilter instead)
- automatic rotation and stereoscopic video handling - automatic rotation and stereoscopic video handling
- Linux TV input - Linux TV input
- the --frames option
- the add/cycle and sub-add/audio-add/sub-remove/audio-remove commands - the add/cycle and sub-add/audio-add/sub-remove/audio-remove commands
- video format conversion (if not supported by the VO) - video format conversion (if not supported by the VO)
- minor features: jack, DVD, CDDA, SMB, CACA, legacy direct3d VO - minor features: jack, DVD, CDDA, SMB, CACA, legacy direct3d VO
@ -111,10 +110,8 @@ The following files are still GPL only (--enable-lgpl disables them):
The following files contain some optional GPL code (--enable-lgpl disables it): The following files contain some optional GPL code (--enable-lgpl disables it):
input/cmd_list.c potentially some commands input/cmd_list.c potentially some commands
options/options.c --frames option
options/parse_commandline.c dvd:// expansion options/parse_commandline.c dvd:// expansion
player/audio.c libaf glue code player/audio.c libaf glue code
player/loadfile.c --frames option (minor but probably fatal)
player/osd.c OSD level 3 player/osd.c OSD level 3
player/command.c add/cycle command, possibly sub-add command player/command.c add/cycle command, possibly sub-add command

5
options/options.c
View File

@ -13,8 +13,6 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with mpv. If not, see <http://www.gnu.org/licenses/>. * License along with mpv. If not, see <http://www.gnu.org/licenses/>.
*
* Parts under HAVE_GPL are licensed under GNU General Public License.
*/ */
#ifndef MPLAYER_CFG_MPLAYER_H #ifndef MPLAYER_CFG_MPLAYER_H
@ -326,10 +324,7 @@ const m_option_t mp_opts[] = {
// ------------------------- demuxer options -------------------- // ------------------------- demuxer options --------------------
#if HAVE_GPL
// Possibly GPL due to d8fd7131bbcde029ab41799fd3162050b43f6848.
OPT_CHOICE_OR_INT("frames", play_frames, 0, 0, INT_MAX, ({"all", -1})), OPT_CHOICE_OR_INT("frames", play_frames, 0, 0, INT_MAX, ({"all", -1})),
#endif
OPT_REL_TIME("start", play_start, 0), OPT_REL_TIME("start", play_start, 0),
OPT_REL_TIME("end", play_end, 0), OPT_REL_TIME("end", play_end, 0),

6
player/loadfile.c
View File

@ -1193,10 +1193,7 @@ static void play_current_file(struct MPContext *mpctx)
load_per_file_options(mpctx->mconfig, mpctx->playing->params, load_per_file_options(mpctx->mconfig, mpctx->playing->params,
mpctx->playing->num_params); mpctx->playing->num_params);
#if HAVE_GPL
// Possibly GPL due to d8fd7131bbcde029ab41799fd3162050b43f6848.
mpctx->max_frames = opts->play_frames; mpctx->max_frames = opts->play_frames;
#endif
handle_force_window(mpctx, false); handle_force_window(mpctx, false);
@ -1323,15 +1320,12 @@ reopen_file:
mp_notify(mpctx, MPV_EVENT_FILE_LOADED, NULL); mp_notify(mpctx, MPV_EVENT_FILE_LOADED, NULL);
update_screensaver_state(mpctx); update_screensaver_state(mpctx);
#if HAVE_GPL
// Possibly GPL due to d8fd7131bbcde029ab41799fd3162050b43f6848.
if (mpctx->max_frames == 0) { if (mpctx->max_frames == 0) {
if (!mpctx->stop_play) if (!mpctx->stop_play)
mpctx->stop_play = PT_NEXT_ENTRY; mpctx->stop_play = PT_NEXT_ENTRY;
mpctx->error_playing = 0; mpctx->error_playing = 0;
goto terminate_playback; goto terminate_playback;
} }
#endif
double startpos = rel_time_to_abs(mpctx, opts->play_start); double startpos = rel_time_to_abs(mpctx, opts->play_start);
if (startpos == MP_NOPTS_VALUE && opts->chapterrange[0] > 0) { if (startpos == MP_NOPTS_VALUE && opts->chapterrange[0] > 0) {