[FFmpeg-cvslog] lavc: fix previous merge

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Thu Jun 23 00:42:16 2016 +0200| [aef2d3d2b5f9eb33cdf1a4f7b8a2fd83f393d665] | committer: Clément Bœsch

lavc: fix previous merge

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aef2d3d2b5f9eb33cdf1a4f7b8a2fd83f393d665
---

 libavcodec/rl.c  |    1 +
 libavcodec/vlc.h |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libavcodec/rl.c b/libavcodec/rl.c
index a925240..6eac306 100644
--- 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 4ade8243..9e38f8c 100644
--- 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
  */