diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 00:32:50 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 00:33:31 +0200 |
commit | a4e0defa75b6f766aa31d80c55688d036b5fd87b (patch) | |
tree | aad13d8b9f98ec3111ff405795a492fc31e2e881 /libavutil/x86/float_dsp_init.c | |
parent | cff8f91ddfbdef72be7ec3adec6adf3e92ae4a27 (diff) | |
parent | 0c2466dec719b933d161f5d680a57fde38aa5daa (diff) | |
download | ffmpeg-a4e0defa75b6f766aa31d80c55688d036b5fd87b.tar.gz |
Merge commit '0c2466dec719b933d161f5d680a57fde38aa5daa'
* commit '0c2466dec719b933d161f5d680a57fde38aa5daa':
vf_transpose: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_transpose.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86/float_dsp_init.c')
0 files changed, 0 insertions, 0 deletions