aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/avio_internal.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-24 00:35:40 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-24 00:35:40 +0200
commit074bb7515e33780be35dd62e881cacd485cea382 (patch)
treec22c6eb19b13d85ca2617656bf9ba7d5b0416735 /libavformat/avio_internal.h
parent670b7f203ad24bccfe9effe81769b41f769052a6 (diff)
parentc3c96deb5f8cbbdb700ba97920ceedddacb5dcb9 (diff)
downloadffmpeg-074bb7515e33780be35dd62e881cacd485cea382.tar.gz
Merge commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9'
* commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9': fft-test: Check memory allocations Conflicts: libavcodec/fft-test.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avio_internal.h')
0 files changed, 0 insertions, 0 deletions