diff options
author | wm4 <wm4@nowhere> | 2017-06-16 15:47:54 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-06-16 15:50:00 +0200 |
commit | cd019ba602c142512c65edbfc1018b064b2c1c98 (patch) | |
tree | 561244104a6d0816c3ae550b84a341100b13672e | |
parent | 071118e4d27afb4759bc098c7c70d0bd041dc1f5 (diff) | |
download | mpv-cd019ba602c142512c65edbfc1018b064b2c1c98.tar.bz2 mpv-cd019ba602c142512c65edbfc1018b064b2c1c98.tar.xz |
demux_lavf: change license to LGPL (almost)
Since this demuxer is based on code by michael, this file can become
LGPL only once the mpv core becomes LGPL, and this is preparation for
it.
There were quite a lot of changes for rearranging preferred libavformat
vs. internal MPlayer demuxers, codec mappings, and filename extensions,
but all this got removed, so some of the relevant authors weren't asked.
cehoyos, who disagreed with LGPL, made a few changes in the past (mostly
codec mapping and deinterlacing related things), but all of them were
removed, mostly due to libavformat API cleanups.
adland, who could not be reached, did commit 057916ee65, but it's easy
to essentially revert the change (this is what the source changes in
this commit do), so we don't need to think about it.
Chris Welton, who could not be reached, made a simple change in commit
958c41d9b69. Fortunately, the API changed again, and his changes were
removed, so we don't need to think about this either.
There is an anonymous contribution in commit 085f35f4b48 - since this
did not introduce any original code, and the probe code was heavily
rewritten multiple times, I don't consider it relevant.
-rw-r--r-- | Copyright | 2 | ||||
-rw-r--r-- | demux/demux_lavf.c | 7 |
2 files changed, 5 insertions, 4 deletions
@@ -130,7 +130,7 @@ LGPL relicensing status: demux/demux_cue.c LGPL demux/demux_disc.c LGPL demux/demux_edl.c LGPL - demux/demux_lavf.c hard + demux/demux_lavf.c almost LGPL demux/demux_libarchive.c LGPL demux/demux_mf.c hard demux/demux_mkv.c LGPL (mostly) diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index da5967f1dd..e7a31e3df4 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -15,6 +15,8 @@ * * You should have received a copy of the GNU General Public License along * with mpv. If not, see <http://www.gnu.org/licenses/>. + * + * Almost LGPL. */ #include <stdlib.h> @@ -1171,10 +1173,9 @@ static void demux_close_lavf(demuxer_t *demuxer) { lavf_priv_t *priv = demuxer->priv; if (priv) { - if (priv->avfc) { + if (priv->avfc) av_freep(&priv->avfc->key); - avformat_close_input(&priv->avfc); - } + avformat_close_input(&priv->avfc); if (priv->pb) av_freep(&priv->pb->buffer); av_freep(&priv->pb); |