aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/af_asetnsamples.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-12 15:12:52 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-12 15:26:06 +0200
commitba5e77814e5cb60d8476b831cdb6223cea98a7d4 (patch)
tree33f117c088439755b9fcbb0a8965e5005b3069d1 /libavfilter/af_asetnsamples.c
parent52ed1d6d5847bc065ca2ca0378365d008374de49 (diff)
parent00a63bfb87af6cf7bcdf85848830a90c7e052d41 (diff)
downloadffmpeg-ba5e77814e5cb60d8476b831cdb6223cea98a7d4.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: matroskaenc: Fix stray pointers left over from av_reallocp_array refactoring Conflicts: libavformat/matroskaenc.c Mostly not merged as the buggy code was no longer part of FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_asetnsamples.c')
0 files changed, 0 insertions, 0 deletions