projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
adff0a8
)
h264: Remove some commented-out, broken cruft
author
Diego Biurrun
<diego@biurrun.de>
Wed, 16 Jul 2014 19:26:34 +0000
(12:26 -0700)
committer
Diego Biurrun
<diego@biurrun.de>
Wed, 16 Jul 2014 19:26:34 +0000
(12:26 -0700)
libavcodec/h264_direct.c
patch
|
blob
|
history
diff --git
a/libavcodec/h264_direct.c
b/libavcodec/h264_direct.c
index
83c5958
..
e098283
100644
(file)
--- a/
libavcodec/h264_direct.c
+++ b/
libavcodec/h264_direct.c
@@
-500,7
+500,7
@@
single_col:
map_col_to_list0[1] = h->map_col_to_list0_field[h->mb_y&1][1];
dist_scale_factor =h->dist_scale_factor_field[h->mb_y&1];
}
- ref_offset = (h->ref_list[1][0].mbaff<<4) & (mb_type_col[0]>>3);
//if(h->ref_list[1][0].mbaff && IS_INTERLACED(mb_type_col[0])) ref_offset=16 else 0
+ ref_offset = (h->ref_list[1][0].mbaff<<4) & (mb_type_col[0]>>3);
if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col[0])){
int y_shift = 2*!IS_INTERLACED(*mb_type);