qsvdec: only access hwaccel_context is the pixel format is QSV

[ffmpeg] / libavcodec / msmpeg4data.h

diff --git a/libavcodec/msmpeg4data.h b/libavcodec/msmpeg4data.h
index b9ffb2719776cbe7206d38f90129b2cb582e3bef..2c2dfabc167cfaefff573c692e316b7b0a292b23 100644 (file)
--- a/libavcodec/msmpeg4data.h
+++ b/libavcodec/msmpeg4data.h
@@ -1,29 +1,29 @@
 /*
- * MSMPEG4 backend for ffmpeg encoder and decoder
+ * MSMPEG4 backend for encoder and decoder
  * copyright (c) 2001 Fabrice Bellard
  * copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
  *
  * msmpeg4v1 & v2 stuff by Michael Niedermayer <michaelni@gmx.at>
  *
- * 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
  */
 
 /**
- * @file msmpeg4data.h
+ * @file
  * MSMPEG4 data tables.
  */
 
@@ -31,8 +31,9 @@
 #define AVCODEC_MSMPEG4DATA_H
 
 #include "libavutil/common.h"
-#include "bitstream.h"
+
 #include "rl.h"
+#include "vlc.h"
 
 /* motion vector table */
 typedef struct MVTable {
@@ -49,41 +50,32 @@ extern VLC ff_msmp4_mb_i_vlc;
 extern VLC ff_msmp4_dc_luma_vlc[2];
 extern VLC ff_msmp4_dc_chroma_vlc[2];
 
-/* intra picture macro block coded block pattern */
+/* intra picture macroblock coded block pattern */
 extern const uint16_t ff_msmp4_mb_i_table[64][2];
 
-extern const uint8_t cbpy_tab[16][2];
-
-extern const uint8_t DCtab_lum[13][2];
-extern const uint8_t DCtab_chrom[13][2];
-
-extern const uint8_t mvtab[33][2];
-
-extern const uint8_t intra_MCBPC_code[9];
-extern const uint8_t intra_MCBPC_bits[9];
-
-extern const uint8_t inter_MCBPC_code[28];
-extern const uint8_t inter_MCBPC_bits[28];
-
 #define WMV1_SCANTABLE_COUNT 4
 
-extern const uint8_t wmv1_scantable[WMV1_SCANTABLE_COUNT][64];
+extern const uint8_t ff_wmv1_scantable[WMV1_SCANTABLE_COUNT][64];
 
 #define NB_RL_TABLES  6
 
-extern RLTable rl_table[NB_RL_TABLES];
+extern RLTable ff_rl_table[NB_RL_TABLES];
+extern uint8_t ff_static_rl_table_store[NB_RL_TABLES][2][2 * MAX_RUN + MAX_LEVEL + 3];
 
-extern const uint8_t wmv1_y_dc_scale_table[32];
-extern const uint8_t wmv1_c_dc_scale_table[32];
-extern const uint8_t old_ff_y_dc_scale_table[32];
+extern uint32_t ff_v2_dc_lum_table[512][2];
+extern uint32_t ff_v2_dc_chroma_table[512][2];
 
-extern MVTable mv_tables[2];
+extern const uint8_t ff_wmv1_y_dc_scale_table[32];
+extern const uint8_t ff_wmv1_c_dc_scale_table[32];
+extern const uint8_t ff_old_ff_y_dc_scale_table[32];
 
-extern const uint8_t v2_mb_type[8][2];
-extern const uint8_t v2_intra_cbpc[4][2];
+extern MVTable ff_mv_tables[2];
 
-extern const uint32_t table_mb_non_intra[128][2];
-extern const uint8_t  table_inter_intra[4][2];
+extern const uint8_t ff_v2_mb_type[8][2];
+extern const uint8_t ff_v2_intra_cbpc[4][2];
+
+extern const uint32_t ff_table_mb_non_intra[128][2];
+extern const uint8_t  ff_table_inter_intra[4][2];
 
 extern const uint32_t ff_table0_dc_lum[120][2];
 extern const uint32_t ff_table1_dc_lum[120][2];
@@ -91,9 +83,6 @@ extern const uint32_t ff_table0_dc_chroma[120][2];
 extern const uint32_t ff_table1_dc_chroma[120][2];
 
 #define WMV2_INTER_CBP_TABLE_COUNT 4
-extern const uint32_t (*wmv2_inter_table[WMV2_INTER_CBP_TABLE_COUNT])[2];
-
-extern const uint8_t wmv2_scantableA[64];
-extern const uint8_t wmv2_scantableB[64];
+extern const uint32_t (* const ff_wmv2_inter_table[WMV2_INTER_CBP_TABLE_COUNT])[2];
 
 #endif /* AVCODEC_MSMPEG4DATA_H */