Move H.264 tables that are only useful for encoding to h264enc.c.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@15899 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h
index fa4bff8e8499960a9ea0ef5b444e3b9a5662ebf2..069116b1822c8b62207e5e8c789461d846c9697f 100644 (file)
--- a/libavcodec/h264data.h
+++ b/libavcodec/h264data.h
@@ -57,9 +57,6 @@ static const AVRational pixel_aspect[17]={
 static const uint8_t golomb_to_pict_type[5]=
 {FF_P_TYPE, FF_B_TYPE, FF_I_TYPE, FF_SP_TYPE, FF_SI_TYPE};
 
-static const uint8_t pict_type_to_golomb[7]=
-{-1, 2, 0, 1, -1, 4, 3};
-
 static const uint8_t chroma_qp[52]={
     0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,
    12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,
@@ -80,18 +77,6 @@ static const uint8_t golomb_to_inter_cbp[48]={
  17, 18, 20, 24, 19, 21, 26, 28, 23, 27, 29, 30, 22, 25, 38, 41
 };
 
-static const uint8_t intra4x4_cbp_to_golomb[48]={
-  3, 29, 30, 17, 31, 18, 37,  8, 32, 38, 19,  9, 20, 10, 11,  2,
- 16, 33, 34, 21, 35, 22, 39,  4, 36, 40, 23,  5, 24,  6,  7,  1,
- 41, 42, 43, 25, 44, 26, 46, 12, 45, 47, 27, 13, 28, 14, 15,  0
-};
-
-static const uint8_t inter_cbp_to_golomb[48]={
-  0,  2,  3,  7,  4,  8, 17, 13,  5, 18,  9, 14, 10, 15, 16, 11,
-  1, 32, 33, 36, 34, 37, 44, 40, 35, 45, 38, 41, 39, 42, 43, 19,
-  6, 24, 25, 20, 26, 21, 46, 28, 27, 47, 22, 29, 23, 30, 31, 12
-};
-
 static const uint8_t golomb_to_inter_cbp_gray[16]={
  0, 1, 2, 4, 8, 3, 5,10,12,15, 7,11,13,14, 6, 9,
 };

diff --git a/libavcodec/h264enc.c b/libavcodec/h264enc.c
index 2cff901ea5d907371d7bb6178be51b02f5881d2f..4a760c62293faf1863e427290e75cbb1463fff6e 100644 (file)
--- a/libavcodec/h264enc.c
+++ b/libavcodec/h264enc.c
@@ -107,3 +107,16 @@ static uint8_t *h264_write_nal_unit(int nal_ref_idc, int nal_unit_type, uint8_t
     return dest+destpos;
 }
 
+static const uint8_t pict_type_to_golomb[7] = {-1, 2, 0, 1, -1, 4, 3};
+
+static const uint8_t intra4x4_cbp_to_golomb[48] = {
+    3, 29, 30, 17, 31, 18, 37,  8, 32, 38, 19,  9, 20, 10, 11,  2,
+   16, 33, 34, 21, 35, 22, 39,  4, 36, 40, 23,  5, 24,  6,  7,  1,
+   41, 42, 43, 25, 44, 26, 46, 12, 45, 47, 27, 13, 28, 14, 15,  0
+};
+
+static const uint8_t inter_cbp_to_golomb[48] = {
+    0,  2,  3,  7,  4,  8, 17, 13,  5, 18,  9, 14, 10, 15, 16, 11,
+    1, 32, 33, 36, 34, 37, 44, 40, 35, 45, 38, 41, 39, 42, 43, 19,
+    6, 24, 25, 20, 26, 21, 46, 28, 27, 47, 22, 29, 23, 30, 31, 12
+};