Merge commit '256da0770e495176d1b2699ec6e9c7993c2a6d7b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 22:42:36 +0000 (00:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 22:42:36 +0000 (00:42 +0200)
commit5c6e94c42bcdc026071855a6b1749406b2456c8b
treee8ce939224cce418e2069a83f41ad706c3fcd94a
parenta9a312d299c785b4b4655ab70753aa5a2a933aae
parent256da0770e495176d1b2699ec6e9c7993c2a6d7b
Merge commit '256da0770e495176d1b2699ec6e9c7993c2a6d7b'

* commit '256da0770e495176d1b2699ec6e9c7993c2a6d7b':
  dsputil: Move mspel_pixels_tab to the only place it is used

Conflicts:
libavcodec/dsputil.c

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