pcm: switch to ff_alloc_packet2().

[ffmpeg] / libavcodec / msmpeg4data.h

diff --git a/libavcodec/msmpeg4data.h b/libavcodec/msmpeg4data.h
index 008265a2ca5f39b09b401317c48dd346002be330..24a10d9f2ec2be5866d61e8b4c9f4a24d92e4793 100644 (file)
--- a/libavcodec/msmpeg4data.h
+++ b/libavcodec/msmpeg4data.h
@@ -54,23 +54,27 @@ extern const uint16_t ff_msmp4_mb_i_table[64][2];
 
 #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];
@@ -78,9 +82,9 @@ 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 (* const wmv2_inter_table[WMV2_INTER_CBP_TABLE_COUNT])[2];
+extern const uint32_t (* const ff_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 uint8_t ff_wmv2_scantableA[64];
+extern const uint8_t ff_wmv2_scantableB[64];
 
 #endif /* AVCODEC_MSMPEG4DATA_H */