diff options
| -rw-r--r-- | Copyright | 6 | ||||
| -rw-r--r-- | video/decode/vd.h | 14 | ||||
| -rw-r--r-- | video/decode/vd_lavc.c | 12 |
3 files changed, 21 insertions, 11 deletions
@@ -264,9 +264,9 @@ LGPL relicensing status: video/decode/hw_d3d11va.c LGPL video/decode/hw_dxva2.c LGPL video/decode/hw_videotoolbox.c LGPL - video/decode/lavc.h hard - video/decode/vd.h hard - video/decode/vd_lavc.c very hard + video/decode/lavc.h almost LGPLv3+ + video/decode/vd.h LGPL + video/decode/vd_lavc.c almost LGPLv3+ video/filter/refqueue.* LGPL video/filter/vf.c LGPL video/filter/vf.h LGPL (mostly) diff --git a/video/decode/vd.h b/video/decode/vd.h index 3897eedc31..980de44bdc 100644 --- a/video/decode/vd.h +++ b/video/decode/vd.h @@ -1,18 +1,18 @@ /* * This file is part of mpv. * - * 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. + * mpv is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * 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. + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License along - * with mpv. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see <http://www.gnu.org/licenses/>. */ #ifndef MPLAYER_VD_H diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 581f50979b..209ad8c0c5 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -13,6 +13,16 @@ * * You should have received a copy of the GNU General Public License along * with mpv. If not, see <http://www.gnu.org/licenses/>. + * + * Almost LGPLv3+. + * + * The parts potentially making this file LGPL v3 (instead of v2.1 or later) are: + * 376e3abf5c7d2 xvmc use get_format for IDCT/MC recognition + * c73f0e18bd1d6 Return PIX_FMT_NONE if the video system refuses all other formats. + * (iive agreed to LGPL v3+ only. Jeremy agreed to LGPL v2.1 or later.) + * Once these changes are not relevant to for copyright anymore (e.g. because + * they have been removed), and the core is LGPL, this file will change to + * LGPLv2.1+. */ #include <stdio.h> @@ -573,7 +583,6 @@ static void init_avctx(struct dec_video *vd, const char *decoder, AVCodecContext *avctx = ctx->avctx; if (!ctx->avctx) goto error; - avctx->opaque = vd; avctx->codec_type = AVMEDIA_TYPE_VIDEO; avctx->codec_id = lavc_codec->id; @@ -586,6 +595,7 @@ static void init_avctx(struct dec_video *vd, const char *decoder, goto error; if (ctx->hwdec) { + avctx->opaque = vd; avctx->thread_count = 1; #if HAVE_VDPAU_HWACCEL avctx->hwaccel_flags |= AV_HWACCEL_FLAG_IGNORE_LEVEL; |