[FFmpeg-cvslog] Merge commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 18 19:58:18 2014 +0100| [61ad2b42a1e890f7b2de6517d735819bf3309705] | committer: Michael Niedermayer

Merge commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1'

* commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1':
  sbrdsp: move #if to disable all educational code

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

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