Michael Niedermayer d35899ccce Merge commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b' ...

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

Conflicts:
	libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-05-30 01:23:04 +02:00

4.4 KiB

Raw Blame History

View Raw