]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae9b468 d961a79)
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)
* commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1':
  sbrdsp: move #if to disable all educational code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/sbrdsp.c patch | diff1 | diff2 | blob | history

diff --cc libavcodec/sbrdsp.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.