lavc: fix previous merge

diff --git a/libavcodec/rl.c b/libavcodec/rl.c
index a925240a982f5f427135d068e2e73e37c24c32c0..6eac306b88ae8550fc15386ab6b65711f9f9931f 100644 (file)
--- a/libavcodec/rl.c
+++ b/libavcodec/rl.c
@@ -20,6 +20,7 @@
 #include <string.h>
 
 #include "libavutil/attributes.h"
+#include "libavutil/avassert.h"
 #include "libavutil/mem.h"
 
 #include "rl.h"

diff --git a/libavcodec/vlc.h b/libavcodec/vlc.h
index 4ade824391d97e3ecd57ebcf5d0d13a28b102706..9e38f8c6b21a73de2f9832579312d7ea34233015 100644 (file)
--- a/libavcodec/vlc.h
+++ b/libavcodec/vlc.h
@@ -1,18 +1,18 @@
 /*
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg 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.
  *
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg 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
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */