aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-12-22 16:14:06 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-12-22 16:14:06 +0000
commit03a035e059f441e9142c7a79f5ac208c1eb676c5 (patch)
tree654f2d984468b69f9e58106d242701c4948acd61 /libavcodec/h264.c
parent6f3c50f2f9e9327b78b238ab99977f5c750e7b34 (diff)
downloadffmpeg-03a035e059f441e9142c7a79f5ac208c1eb676c5.tar.gz
Simplify if/else, no speed change
Originally committed as revision 16275 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index d81c4ebe54..40433ecb38 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -155,11 +155,7 @@ static void fill_caches(H264Context *h, int mb_type, int for_deblock){
left_xy[1] += s->mb_stride;
left_block = left_block_options[3];
} else {
- if (bottom) {
- left_block = left_block_options[1];
- } else {
- left_block= left_block_options[2];
- }
+ left_block= left_block_options[2 - bottom];
}
}
}