aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-17 13:50:09 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-17 13:50:31 +0200
commitb884599f6a1c05ed8a0cbab72ac898d21456a58b (patch)
tree741bc18460fd29b235d1797b6edf9ad87aebdc68 /libavcodec
parent3babbf3bf4c672624d992622cb94856c2ed95bfb (diff)
parenta11ef610eec5241e226efbd1c5bb5eb45c88d2c2 (diff)
downloadffmpeg-b884599f6a1c05ed8a0cbab72ac898d21456a58b.tar.gz
Merge commit 'a11ef610eec5241e226efbd1c5bb5eb45c88d2c2'
* commit 'a11ef610eec5241e226efbd1c5bb5eb45c88d2c2': h264: Remove some commented-out, broken cruft Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264_direct.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index b83a279bc0..9c0ff12f8f 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -503,7 +503,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);