[FFmpeg-cvslog] Merge commit '0e285c2f908789e96e29bfd969ad5eaaa0eece65'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Mar 19 16:07:30 2017 +0100| [adef752f1b187a12c0bfdfc8ce1b1ee7e5a2fb22] | committer: Clément Bœsch

Merge commit '0e285c2f908789e96e29bfd969ad5eaaa0eece65'

* commit '0e285c2f908789e96e29bfd969ad5eaaa0eece65':
  mpegvideo: Kill some disabled code

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=adef752f1b187a12c0bfdfc8ce1b1ee7e5a2fb22
---

 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 0cb1338..c913504 100644
--- a/libavcodec/mpegvideo_motion.c
+++ b/libavcodec/mpegvideo_motion.c
@@ -246,13 +246,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 a7c6102..0af3d8b 100644
--- a/libavcodec/mpegvideoencdsp.c
+++ b/libavcodec/mpegvideoencdsp.c
@@ -85,16 +85,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];
@@ -117,7 +107,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;


======================================================================