Merge commit 'c9f5fcd08c3a33bfb1b473705c792ab051e7428d'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 14:03:32 +0000 (16:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 14:03:32 +0000 (16:03 +0200)
* commit 'c9f5fcd08c3a33bfb1b473705c792ab051e7428d':
  dsputil: Merge 9-10 bpp functions for get_pixels and draw_edge

Conflicts:
libavcodec/dsputil.c

No difference as this has been part of ffmpeg since a while and
the rebased commit does also not introduce new changes.

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

Trivial merge