Merge commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jul 2014 22:35:40 +0000 (00:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jul 2014 22:35:40 +0000 (00:35 +0200)
commit074bb7515e33780be35dd62e881cacd485cea382
treec22c6eb19b13d85ca2617656bf9ba7d5b0416735
parent670b7f203ad24bccfe9effe81769b41f769052a6
parentc3c96deb5f8cbbdb700ba97920ceedddacb5dcb9
Merge commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9'

* commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9':
  fft-test: Check memory allocations

Conflicts:
libavcodec/fft-test.c

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