aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-02-27 04:09:48 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-02-27 04:09:48 +0000
commitce9c69161604eaabd3b1b758077192dd3aba870a (patch)
treea305b79896679cfe17a451f83e6d271b7fa88b11 /libavcodec
parent82fb5bb2ee991405e7cd60c961b2df0605ce3a18 (diff)
downloadffmpeg-ce9c69161604eaabd3b1b758077192dd3aba870a.tar.gz
Merge h->slice_table[left_xy[0/1] ] checks, 4 cpu cycles speedup
Originally committed as revision 22086 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index d4d87b171c..1afce71c50 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -821,8 +821,7 @@ static void fill_decode_neighbors(H264Context *h, int mb_type){
if(h->slice_table[topleft_xy ] != h->slice_num) h->topleft_type = 0;
if(h->slice_table[top_xy ] != h->slice_num) h->top_type = 0;
if(h->slice_table[topright_xy] != h->slice_num) h->topright_type= 0;
- if(h->slice_table[left_xy[0] ] != h->slice_num) h->left_type[0] = 0;
- if(h->slice_table[left_xy[1] ] != h->slice_num) h->left_type[1] = 0;
+ if(h->slice_table[left_xy[0] ] != h->slice_num) h->left_type[0] = h->left_type[1] = 0;
}
static void fill_decode_caches(H264Context *h, int mb_type){