Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Oct 2012 13:54:37 +0000 (15:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Oct 2012 13:55:41 +0000 (15:55 +0200)
commitbb35864759197ac17fe0057b0897f14b0fc54788
tree9ac2a32eb5293d6bcc9dd0fa06c6a660da523532
parent526cb36e4b23d2aae14bba0d19947137ee94f263
parent1ec629308652b382a409ffa61e049c074ee5e695
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mlpdsp: adding missing file
  dsputil: split out mlp dsp function
  sh4: add required #include, fix build
  averror: make error values proper negative values
  build: do not use LIB as variable name
  build: whitespace cosmetics
  build: remove single-use variable THIS_LIB

Conflicts:
libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/mlpdec.c
libavcodec/mlpdsp.c
libavcodec/mlpdsp.h
libavcodec/sh4/qpel.c
libavcodec/x86/mlpdsp.c
library.mak