git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a58ed9a
)
VP8: shave a few clocks off check_intra_pred_mode
author
Jason Garrett-Glaser
<darkshikari@gmail.com>
Fri, 23 Jul 2010 10:24:38 +0000
(10:24 +0000)
committer
Jason Garrett-Glaser
<darkshikari@gmail.com>
Fri, 23 Jul 2010 10:24:38 +0000
(10:24 +0000)
Originally committed as revision 24458 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/vp8.c
patch
|
blob
|
history
diff --git
a/libavcodec/vp8.c
b/libavcodec/vp8.c
index
8ff6fba
..
762ba95
100644
(file)
--- a/
libavcodec/vp8.c
+++ b/
libavcodec/vp8.c
@@
-929,12
+929,11
@@
void xchg_mb_border(uint8_t *top_border, uint8_t *src_y, uint8_t *src_cb, uint8_
static int check_intra_pred_mode(int mode, int mb_x, int mb_y)
{
if (mode == DC_PRED8x8) {
- if (!(mb_x|mb_y))
- mode = DC_128_PRED8x8;
- else if (!mb_y)
- mode = LEFT_DC_PRED8x8;
- else if (!mb_x)
- mode = TOP_DC_PRED8x8;
+ if (!mb_x) {
+ mode = mb_y ? TOP_DC_PRED8x8 : DC_128_PRED8x8;
+ } else if (!mb_y) {
+ mode = mb_x ? LEFT_DC_PRED8x8 : DC_128_PRED8x8;
+ }
}
return mode;
}