summaryrefslogtreecommitdiff
path: root/libavcodec/h264data.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-01-12 05:30:31 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-01-12 05:30:31 +0000
commit903d58f63160a6ba4fe60f3b44affeb4a2edc3ab (patch)
tree474673e21b4de4623ff0cf5dc9a9fdd91322134c /libavcodec/h264data.h
parenta683681336a5f5dcc1b515735078fd2030090ebc (diff)
downloadffmpeg-903d58f63160a6ba4fe60f3b44affeb4a2edc3ab.tar.gz
Get rid of #include "svq3.c"
functions called more than per mb are moved into the header, scan8 is also as it must be known at compiletime. The code after this patch duplicates h264data.h, this has been done to minimize the changes in this step and allow more fine grained benchmarking. Speedwise this is 1% faster on my pentium dual core with diegos cursed cathedral sample. Originally committed as revision 21157 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264data.h')
-rw-r--r--libavcodec/h264data.h20
1 files changed, 0 insertions, 20 deletions
diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h
index 7d60abbd74..8592a0fff4 100644
--- a/libavcodec/h264data.h
+++ b/libavcodec/h264data.h
@@ -232,26 +232,6 @@ static const uint8_t run_bits[7][16]={
{7,6,5,4,3,2,1,1,1,1,1,1,1,1,1},
};
-/*
-o-o o-o
- / / /
-o-o o-o
- ,---'
-o-o o-o
- / / /
-o-o o-o
-*/
-
-static const uint8_t scan8[16 + 2*4]={
- 4+1*8, 5+1*8, 4+2*8, 5+2*8,
- 6+1*8, 7+1*8, 6+2*8, 7+2*8,
- 4+3*8, 5+3*8, 4+4*8, 5+4*8,
- 6+3*8, 7+3*8, 6+4*8, 7+4*8,
- 1+1*8, 2+1*8,
- 1+2*8, 2+2*8,
- 1+4*8, 2+4*8,
- 1+5*8, 2+5*8,
-};
static const uint8_t zigzag_scan[16]={
0+0*4, 1+0*4, 0+1*4, 0+2*4,