diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 10:26:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 10:26:49 +0100 |
| commit | fc5fe4804fd2ee9a29de502e9431b12d027c0c89 (patch) | |
| tree | d7f4d448e386af2964019cfc0eb5efa3698c21cf /libavformat/allformats.c | |
| parent | ffe33500983983946048def3a6047920d97d957b (diff) | |
| parent | ed1a11ed52bbd1f15bb9b0416d69b7924bee3191 (diff) | |
| download | ffmpeg-fc5fe4804fd2ee9a29de502e9431b12d027c0c89.tar.gz | |
Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'
* commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191':
gradfun: x86: Factor out common code for some gradfun_filter_line() variants
Conflicts:
libavfilter/x86/vf_gradfun_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/allformats.c')
0 files changed, 0 insertions, 0 deletions