OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f406061
)
Simplify decode_cabac_mb_intra4x4_pred_mode().
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 15 Feb 2010 19:22:09 +0000
(19:22 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 15 Feb 2010 19:22:09 +0000
(19:22 +0000)
same speed
Originally committed as revision 21839 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/h264_cabac.c
patch
|
blob
|
history
diff --git
a/libavcodec/h264_cabac.c
b/libavcodec/h264_cabac.c
index
76fff71
..
7a37df5
100644
(file)
--- a/
libavcodec/h264_cabac.c
+++ b/
libavcodec/h264_cabac.c
@@
-796,10
+796,7
@@
static int decode_cabac_mb_intra4x4_pred_mode( H264Context *h, int pred_mode ) {
mode += 2 * get_cabac( &h->cabac, &h->cabac_state[69] );
mode += 4 * get_cabac( &h->cabac, &h->cabac_state[69] );
- if( mode >= pred_mode )
- return mode + 1;
- else
- return mode;
+ return mode + ( mode >= pred_mode );
}
static int decode_cabac_mb_chroma_pre_mode( H264Context *h) {