d3d11va: make av_d3d11va_alloc_context() available at all times

[ffmpeg] / libavcodec / vp6data.h

diff --git a/libavcodec/vp6data.h b/libavcodec/vp6data.h
index 8d4bb0b57f728aebb0864836b639297a29c1e493..2de90e7be72acedb1bed885e58a14463fc96e5de 100644 (file)
--- a/libavcodec/vp6data.h
+++ b/libavcodec/vp6data.h
@@ -1,30 +1,34 @@
-/**
- * @file vp6data.h
- * VP6 compatible video decoder
- *
+/*
  * Copyright (C) 2006  Aurelien Jacobs <aurel@gnuage.org>
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav 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.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav 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 FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_VP6DATA_H
-#define FFMPEG_VP6DATA_H
+/**
+ * @file
+ * VP6 compatible video decoder
+ */
+
+#ifndef AVCODEC_VP6DATA_H
+#define AVCODEC_VP6DATA_H
+
+#include <stdint.h>
 
-#include "vp56data.h"
+#include "vp56.h"
 
 static const uint8_t vp6_def_fdv_vector_model[2][8] = {
     { 247, 210, 135, 68, 138, 220, 239, 246 },
@@ -283,7 +287,7 @@ static const int16_t vp6_block_copy_filter[17][8][4] = {
     {  -2,  16, 118,  -4  } },
 };
 
-static const vp56_tree_t vp6_pcr_tree[] = {
+static const VP56Tree vp6_pcr_tree[] = {
     { 8, 0},
     { 4, 1},
     { 2, 2}, {-1}, {-2},
@@ -305,4 +309,4 @@ static const uint8_t vp6_huff_run_map[] = {
     10, 13, 11, 12, 0, 1, 2, 3, 14, 8, 15, 16, 4, 5, 6, 7
 };
 
-#endif /* FFMPEG_VP6DATA_H */
+#endif /* AVCODEC_VP6DATA_H */