diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-05 12:17:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-05 12:17:35 +0100 |
| commit | be74cb5159ef7f47c400be23c56cdbf6334b6d3e (patch) | |
| tree | 28e8e85da75739ecf45bf0ba8aa95638b204bcf1 /libswresample/log2_tab.c | |
| parent | 6a7de2361b94cef914f397314103c67165bdff53 (diff) | |
| parent | 7d1a68e95baf232e1c3ee93ee3285f4b309d77ce (diff) | |
| download | ffmpeg-be74cb5159ef7f47c400be23c56cdbf6334b6d3e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer
Conflicts:
libavfilter/buffer.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/log2_tab.c')
0 files changed, 0 insertions, 0 deletions