summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Copyright2
-rw-r--r--demux/demux_lavf.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/Copyright b/Copyright
index c7d7cd8ca6..e7b6f39b21 100644
--- a/Copyright
+++ b/Copyright
@@ -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);