]> git.sesse.net Git - ffmpeg/commit
Merge commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Mar 2014 18:58:18 +0000 (19:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Mar 2014 18:59:00 +0000 (19:59 +0100)
commit61ad2b42a1e890f7b2de6517d735819bf3309705
treef9c0d57bd12cd89a83a9e1f4e29207b09b82de62
parentae9b468b08bd561ba13292933a65c000b94c3a3b
parentd961a79eb07a8911540a0bd356d68ae0cf93c6a1
Merge commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/sbrdsp.c