Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Nov 2012 12:23:35 +0000 (13:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Nov 2012 12:23:35 +0000 (13:23 +0100)
* qatar/master:
  x86: dsputil: port to cpuflags
  crc: av_crc() parameter names should match between .c, .h and doxygen
  avserver: replace av_read_packet with av_read_frame
  avserver: fix constness casting warnings

Conflicts:
libavcodec/x86/dsputil.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
ffserver.c
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_mmx.c
libavutil/crc.h

diff --cc ffserver.c
Simple merge
@@@ -1244,14 -1246,11 +1250,13 @@@ cglobal butterflies_float_interleave, 4
  
  INIT_XMM sse
  BUTTERFLIES_FLOAT_INTERLEAVE
 +%if HAVE_AVX_EXTERNAL
  INIT_YMM avx
  BUTTERFLIES_FLOAT_INTERLEAVE
 +%endif
  
- INIT_XMM sse2
  ; %1 = aligned/unaligned
- %macro BSWAP_LOOPS_SSE2  1
+ %macro BSWAP_LOOPS  1
      mov      r3, r2
      sar      r2, 3
      jz       .left4_%1
Simple merge
diff --cc libavutil/crc.h
Simple merge