diff options
| author | Matthieu Bouron <matthieu.bouron@stupeflix.com> | 2016-06-27 17:18:25 +0200 |
|---|---|---|
| committer | Matthieu Bouron <matthieu.bouron@stupeflix.com> | 2016-06-27 17:18:25 +0200 |
| commit | 39d6d3618d48625decaff7d9bdbb45b44ef2a805 (patch) | |
| tree | a909615b06a988485fea5629b559308ff94ea95b /libavdevice/dshow_pin.c | |
| parent | d693392886b8454c818e384c816b9ede53c570d8 (diff) | |
| parent | 1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e (diff) | |
| download | ffmpeg-39d6d3618d48625decaff7d9bdbb45b44ef2a805.tar.gz | |
Merge commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e'
* commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e':
asm: FF_-prefix internal macros used in inline assembly
This commit is a noop as the ASM codebase differs too much between libav
and ffmpeg. The corresponding chunks will be found in the next commit.
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
Diffstat (limited to 'libavdevice/dshow_pin.c')
0 files changed, 0 insertions, 0 deletions