summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/ve_nuv.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 18:59:15 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 18:59:15 +0200
commitb0986b3760b0174be6a58e1754353102f3230c79 (patch)
tree0c9f5a05216a547ae4ddf3b2669749f88ec3f801 /libmpcodecs/ve_nuv.c
parent5fc54a6caad5f24b993da2e282c896269a6abc49 (diff)
parent23db422c3d40a5202d61b5ca154cf5286d9ac0a5 (diff)
downloadmpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.bz2
mpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.xz
Merge svn changes up to r30463
Note that r30455 is wrong, that commit does not in fact change the default behavior as claimed in the commit message. It only breaks "-af-adv force=0", which was already pretty much useless though.
Diffstat (limited to 'libmpcodecs/ve_nuv.c')
-rw-r--r--libmpcodecs/ve_nuv.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/libmpcodecs/ve_nuv.c b/libmpcodecs/ve_nuv.c
index b9d9b860ba..5f4a0a2808 100644
--- a/libmpcodecs/ve_nuv.c
+++ b/libmpcodecs/ve_nuv.c
@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer 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.
+ *
+ * MPlayer 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.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>