Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Sep 2012 19:00:15 +0000 (21:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Sep 2012 19:01:10 +0000 (21:01 +0200)
commit50b0edea9f48c831909313c15b0677957789ff53
tree9c1dbf2e74e027022cefbba74543b747d8884485
parent083e65cfd22e44719eedfad4c2d3ed290688661d
parent15616eb04206b64bcf08ad351f4c754e69e00666
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  intrax8: move functions from dsputil to own context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/intrax8.c
libavcodec/intrax8.h
libavcodec/intrax8dsp.c
libavcodec/intrax8dsp.h