diff options
| author | wm4 <wm4@nowhere> | 2017-11-06 20:53:27 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-11-06 20:53:27 +0100 |
| commit | a2a623ebb9309d05113bd400449b618aa21f783f (patch) | |
| tree | b92f74d74e816bd7588f60dad984e3829f6a6c47 /options | |
| parent | 921073bf8645ed9e74e8e2463d2a6f6ab9c7bfe6 (diff) | |
| download | mpv-a2a623ebb9309d05113bd400449b618aa21f783f.tar.bz2 mpv-a2a623ebb9309d05113bd400449b618aa21f783f.tar.xz | |
player: change license of some code surrounding --frames to LGPL
The original author of the patch has agreed now.
Diffstat (limited to 'options')
| -rw-r--r-- | options/options.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/options/options.c b/options/options.c index bac9b3bcaf..22e448d22f 100644 --- a/options/options.c +++ b/options/options.c @@ -13,8 +13,6 @@ * * You should have received a copy of the GNU Lesser General Public * 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 @@ -326,10 +324,7 @@ const m_option_t mp_opts[] = { // ------------------------- demuxer options -------------------- -#if HAVE_GPL - // Possibly GPL due to d8fd7131bbcde029ab41799fd3162050b43f6848. OPT_CHOICE_OR_INT("frames", play_frames, 0, 0, INT_MAX, ({"all", -1})), -#endif OPT_REL_TIME("start", play_start, 0), OPT_REL_TIME("end", play_end, 0), |