Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

Merge commit '0e285c2f908789e96e29bfd969ad5eaaa0eece65'

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

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-19 16:07:30 +01:00
commit adef752f1b
2 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libavcodec/mpegvideo_motion.c
View file

@ -246,13 +246,6 @@ void mpeg_motion_internal(MpegEncContext *s,
uvsrc_x, uvsrc_y, v_edge_pos; uvsrc_x, uvsrc_y, v_edge_pos;
ptrdiff_t uvlinesize, linesize; 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; v_edge_pos = s->v_edge_pos >> field_based;
linesize = s->current_picture.f->linesize[0] << field_based; linesize = s->current_picture.f->linesize[0] << field_based;
uvlinesize = s->current_picture.f->linesize[1] << field_based; uvlinesize = s->current_picture.f->linesize[1] << field_based;

11
libavcodec/mpegvideoencdsp.c
View file

@ -85,16 +85,6 @@ static int pix_norm1_c(uint8_t *pix, int line_size)
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
for (j = 0; j < 16; j += 8) { 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 #if HAVE_FAST_64BIT
register uint64_t x = *(uint64_t *) pix; register uint64_t x = *(uint64_t *) pix;
s += sq[x & 0xff]; s += sq[x & 0xff];
@ -116,7 +106,6 @@ static int pix_norm1_c(uint8_t *pix, int line_size)
s += sq[(x >> 8) & 0xff]; s += sq[(x >> 8) & 0xff];
s += sq[(x >> 16) & 0xff]; s += sq[(x >> 16) & 0xff];
s += sq[(x >> 24) & 0xff]; s += sq[(x >> 24) & 0xff];
#endif
#endif #endif
pix += 8; pix += 8;
} }