diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-24 10:32:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-24 10:35:39 +0200 |
| commit | 1ea28ffc4dbcdda64dc2e774c186f668ef7b030f (patch) | |
| tree | d83681ad83339e990f72a6892e5bcf867601e557 /doc/nut.texi | |
| parent | 04916953584332b457a9485eee0724f33bbb9ba8 (diff) | |
| parent | 0e730494160d973400aed8d2addd1f58a0ec883e (diff) | |
| download | ffmpeg-1ea28ffc4dbcdda64dc2e774c186f668ef7b030f.tar.gz | |
Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e'
* commit '0e730494160d973400aed8d2addd1f58a0ec883e':
avfilter: x86: Port gradfun filter optimizations to yasm
Conflicts:
libavfilter/x86/vf_gradfun_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/nut.texi')
0 files changed, 0 insertions, 0 deletions