Module: libav
Branch: release/12
Commit: 7a036a78d33762f9e1c81040574dfe7ad825ecf4
Author: Diego Biurrun <di...@biurrun.de>
Committer: Sean McGovern <gsean...@gmail.com>
Date: Mon Aug 1 19:56:28 2016 +0200
mpegvideo: Kill some disabled code
---
libavcodec/mpegvideo_motion.c | 7 -------
libavcodec/mpegvideoencdsp.c | 11 -----------
2 files changed, 18 deletions(-)
diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c
index 9589714..8074dba 100644
--- a/libavcodec/mpegvideo_motion.c
+++ b/libavcodec/mpegvideo_motion.c
@@ -279,13 +279,6 @@ void mpeg_motion_internal(MpegEncContext *s,
uvsrc_x, uvsrc_y, v_edge_pos;
ptrdiff_t uvlinesize, linesize;
-#if 0
- if (s->quarter_sample) {
- motion_x >>= 1;
- motion_y >>= 1;
- }
-#endif
-
v_edge_pos = s->v_edge_pos >> field_based;
linesize = s->current_picture.f->linesize[0] << field_based;
uvlinesize = s->current_picture.f->linesize[1] << field_based;
diff --git a/libavcodec/mpegvideoencdsp.c b/libavcodec/mpegvideoencdsp.c
index 2011107..279d233 100644
--- a/libavcodec/mpegvideoencdsp.c
+++ b/libavcodec/mpegvideoencdsp.c
@@ -84,16 +84,6 @@ static int pix_norm1_c(uint8_t *pix, int line_size)
for (i = 0; i < 16; i++) {
for (j = 0; j < 16; j += 8) {
-#if 0
- s += sq[pix[0]];
- s += sq[pix[1]];
- s += sq[pix[2]];
- s += sq[pix[3]];
- s += sq[pix[4]];
- s += sq[pix[5]];
- s += sq[pix[6]];
- s += sq[pix[7]];
-#else
#if HAVE_FAST_64BIT
register uint64_t x = *(uint64_t *) pix;
s += sq[x & 0xff];
@@ -116,7 +106,6 @@ static int pix_norm1_c(uint8_t *pix, int line_size)
s += sq[(x >> 16) & 0xff];
s += sq[(x >> 24) & 0xff];
#endif
-#endif
pix += 8;
}
pix += line_size - 16;
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
