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)
commitff3b59c848b62ca926be676fe8f31765fe34d66f
treedd2fd23ee47d7ae1e90d285cccabfb39effae53c
parentf30cf51d46348a43175041df014049d1fa51ed36
parent8c3849bc76c124d5803f9db52c7c88a79226323d
Merge remote-tracking branch 'qatar/master'

* 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>
ffserver.c
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_mmx.c
libavutil/crc.h