diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 15:12:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 15:26:06 +0200 |
| commit | ba5e77814e5cb60d8476b831cdb6223cea98a7d4 (patch) | |
| tree | 33f117c088439755b9fcbb0a8965e5005b3069d1 /libavfilter/vsrc_life.c | |
| parent | 52ed1d6d5847bc065ca2ca0378365d008374de49 (diff) | |
| parent | 00a63bfb87af6cf7bcdf85848830a90c7e052d41 (diff) | |
| download | ffmpeg-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/vsrc_life.c')
0 files changed, 0 insertions, 0 deletions