diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:04:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:04:04 +0100 |
| commit | a19a10a53e4a2d83320da8d15e6266d98330b80d (patch) | |
| tree | e99040d578f116aa782e2e3ae57f3eb9140aae6e /doc/examples/metadata.c | |
| parent | efdca97cf10450599c1cace171abe897fadfa25d (diff) | |
| parent | 8637f4edeee1a6bd18bc90740fafadd3e1b412aa (diff) | |
| download | ffmpeg-a19a10a53e4a2d83320da8d15e6266d98330b80d.tar.gz | |
Merge commit '8637f4edeee1a6bd18bc90740fafadd3e1b412aa' into release/0.10
* commit '8637f4edeee1a6bd18bc90740fafadd3e1b412aa':
x86: Add CPU flag for the i686 cmov instruction
Conflicts:
doc/APIchanges
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/metadata.c')
0 files changed, 0 insertions, 0 deletions