diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:40:53 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:40:53 +0100 |
| commit | 4b23a8137fd38f06a07e3a679dc956b077e1cf2a (patch) | |
| tree | 08b38f6ef28f8542ee7e21c3fdeb1a6e0908f451 /libavfilter/x86/vf_maskedmerge.asm | |
| parent | 8f540b86125a25ee48ea6da69139356063726b8e (diff) | |
| parent | 52385410b7de012c2562fb5ba8f07a4e1112c4e7 (diff) | |
| download | ffmpeg-4b23a8137fd38f06a07e3a679dc956b077e1cf2a.tar.gz | |
Merge commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7'
* commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7':
des-test: Move a variable declaration to avoid an ifdef
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavfilter/x86/vf_maskedmerge.asm')
0 files changed, 0 insertions, 0 deletions