[FFmpeg-cvslog] Merge commit 'c9f5fcd08c3a33bfb1b473705c792ab051e7428d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 20 16:03:32 2013 +0200| [bf66016e4c03257707e62a0c525a82b9e4fdbdae] | committer: Michael Niedermayer

Merge commit 'c9f5fcd08c3a33bfb1b473705c792ab051e7428d'

* 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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf66016e4c03257707e62a0c525a82b9e4fdbdae
---