OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e916764
)
Cosmetics, vertical align.
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 14 Feb 2010 01:14:05 +0000
(
01:14
+0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 14 Feb 2010 01:14:05 +0000
(
01:14
+0000)
Originally committed as revision 21817 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/h264_direct.c
patch
|
blob
|
history
diff --git
a/libavcodec/h264_direct.c
b/libavcodec/h264_direct.c
index
cf354c8
..
1d8a8ba
100644
(file)
--- a/
libavcodec/h264_direct.c
+++ b/
libavcodec/h264_direct.c
@@
-179,7
+179,7
@@
static void pred_spatial_direct_motion(H264Context * const h, int *mb_type){
int match_count= (left_ref==ref[list]) + (top_ref==ref[list]) + (refc==ref[list]);
if(match_count > 1){ //most common
mv[list]= (mid_pred(A[0], B[0], C[0])&0xFFFF)
-
+(mid_pred(A[1], B[1], C[1])<<16);
+ +(mid_pred(A[1], B[1], C[1])<<16);
}else {
assert(match_count==1);
if(left_ref==ref[list]){