[SCM] libav/experimental: h264: Remove some commented-out, broken cruft
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:03:51 UTC 2014
The following commit has been merged in the experimental branch:
commit a11ef610eec5241e226efbd1c5bb5eb45c88d2c2
Author: Diego Biurrun <diego at biurrun.de>
Date: Wed Jul 16 12:26:34 2014 -0700
h264: Remove some commented-out, broken cruft
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index 83c5958..e098283 100644
--- 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);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list