diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 20:48:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 21:09:06 +0200 |
| commit | 1ee9eacaa492a0f38ae426439516574f4bfae4d9 (patch) | |
| tree | 4e47716bd0c35e7c455516727cc3c76b9256a917 /libavformat/rtpdec_qcelp.c | |
| parent | 85f115b5d8d7d8f39d9a2934242b108f5b7c891e (diff) | |
| parent | 7ed833d78ea661d619124fd898547a900f6480bc (diff) | |
| download | ffmpeg-1ee9eacaa492a0f38ae426439516574f4bfae4d9.tar.gz | |
Merge commit '7ed833d78ea661d619124fd898547a900f6480bc'
* commit '7ed833d78ea661d619124fd898547a900f6480bc':
vf_gradfun: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/gradfun.h
libavfilter/vf_gradfun.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_qcelp.c')
0 files changed, 0 insertions, 0 deletions