diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-01-13 02:17:16 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-01-13 02:17:16 +0000 |
| commit | 8e71d89a7bec63f26db95aabbe9ca5f8974e2ff1 (patch) | |
| tree | 09f52f79c955b3dd4a7c44d7f3bb0c4c8da39ea6 /libavcodec/h264data.h | |
| parent | 0752cd39d27d08cb9530a0450bfa8e54913bfa69 (diff) | |
| download | ffmpeg-8e71d89a7bec63f26db95aabbe9ca5f8974e2ff1.tar.gz | |
Move golomb_to_int*cbp tables back to h264_data.h as svq3.c used them.
Yes i did compile&test, no svq3.c was not recompiled.
Originally committed as revision 21180 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264data.h')
| -rw-r--r-- | libavcodec/h264data.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h index f189781c24..54460bf8e0 100644 --- a/libavcodec/h264data.h +++ b/libavcodec/h264data.h @@ -38,6 +38,18 @@ 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 golomb_to_intra4x4_cbp[48]={ + 47, 31, 15, 0, 23, 27, 29, 30, 7, 11, 13, 14, 39, 43, 45, 46, + 16, 3, 5, 10, 12, 19, 21, 26, 28, 35, 37, 42, 44, 1, 2, 4, + 8, 17, 18, 20, 24, 6, 9, 22, 25, 32, 33, 34, 36, 40, 38, 41 +}; + +static const uint8_t golomb_to_inter_cbp[48]={ + 0, 16, 1, 2, 4, 8, 32, 3, 5, 10, 12, 15, 47, 7, 11, 13, + 14, 6, 9, 31, 35, 37, 42, 44, 33, 34, 36, 40, 39, 43, 45, 46, + 17, 18, 20, 24, 19, 21, 26, 28, 23, 27, 29, 30, 22, 25, 38, 41 +}; + static const uint8_t zigzag_scan[16]={ 0+0*4, 1+0*4, 0+1*4, 0+2*4, 1+1*4, 2+0*4, 3+0*4, 2+1*4, |