Commit 9dd50da6 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge branch 'release/0.8' into release/0.7

* release/0.8:
  Changelog, delete, its too inaccurate, git log is better.
  pngenc: Fix incorrect mask used for interlaced mode.
  dsp: fix diff_bytes_mmx() with small width
  Replace SSE2 instruction in scalarproduct_float_sse() by SSE equivalent.
  Update changelog for 0.7.5 release
Merged-by: 's avatarMichael Niedermayer <>
parents 9208848b 3b18d820
This diff is collapsed.
......@@ -55,7 +55,7 @@ static void png_get_interlaced_row(uint8_t *dst, int row_size,
uint8_t *d;
const uint8_t *s;
mask = ff_png_pass_mask[pass];
mask = (int[]){0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff}[pass];
switch(bits_per_pixel) {
case 1:
memset(dst, 0, row_size);
......@@ -823,6 +823,7 @@ static int vsad16_mmx2(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, i
static void diff_bytes_mmx(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w){
x86_reg i=0;
__asm__ volatile(
"1: \n\t"
"movq (%2, %0), %%mm0 \n\t"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment