Merge commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 23:23:04 +0000 (01:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 23:23:04 +0000 (01:23 +0200)
commitd35899ccce39e77a3f7fb667bdfc710c605d03a4
treea72ecac476a799f37c63fe704758f61044a999e8
parent40f3a87c10d5773eb66e09f4ed3d8197b1840863
parentcb52a17cb62297802b0a77e5af9850d87c3f925b
Merge commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b'

* commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b':
  dsputil: Move Bink-specific add_pixels8 to binkdsp

Conflicts:
libavcodec/dsputil.c

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