diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 00:53:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 00:53:24 +0100 |
| commit | 47754244463cff8873798da774605c7bf8bd763a (patch) | |
| tree | 154c03edbfcb03e00d4701e549a1616c482ca5cd /libavfilter/af_asetrate.c | |
| parent | 4da8dc64be50cd814b4dab75693207dc73bca47a (diff) | |
| parent | 5968415156007de5e154c6af826ab16b7373892a (diff) | |
| download | ffmpeg-47754244463cff8873798da774605c7bf8bd763a.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Define ff_log2_run[] in libavcodec/internal.h.
Replace an incorrect av_free() in movenc.c with av_freep().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_asetrate.c')
0 files changed, 0 insertions, 0 deletions