diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 20:14:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 20:15:15 +0200 |
| commit | d61022d55f1afe8ad05e883f43e186655e0769bb (patch) | |
| tree | 06eb9b92a4d891f08b2f9db318418d4fe86ccb50 /libswresample/options.c | |
| parent | 09764c9909bf1e0816bbf32f9f249b594a2d647b (diff) | |
| parent | 7244cefd6e6ba7258cb022dfd7a284099d88a3e8 (diff) | |
| download | ffmpeg-d61022d55f1afe8ad05e883f43e186655e0769bb.tar.gz | |
Merge commit '7244cefd6e6ba7258cb022dfd7a284099d88a3e8' into release/2.4
* commit '7244cefd6e6ba7258cb022dfd7a284099d88a3e8':
libvpx: Fix mixed use of av_malloc() and av_reallocp()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/options.c')
0 files changed, 0 insertions, 0 deletions