diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-17 14:11:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-17 14:11:51 +0100 |
| commit | 082dd17bd267c39e5a681a78132a1849db70d478 (patch) | |
| tree | 8c834c1679ed150d45fae38fe2954abe79ce5ff8 /libavresample/audio_convert.h | |
| parent | 8d07bbca6360a938c607dab4dcb333e12f3d915b (diff) | |
| parent | 0cf3505930913d3584b215f6912de04ff41366e0 (diff) | |
| download | ffmpeg-082dd17bd267c39e5a681a78132a1849db70d478.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avresample: use valid log context in mixing functions
lavr: remove automatic context close/open for resampling compensation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_convert.h')
0 files changed, 0 insertions, 0 deletions