diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 19:20:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 19:20:25 +0200 |
| commit | 2c10833d5e4c055033eb89c0e10484919fe251a5 (patch) | |
| tree | 524bd726d2e2a64efb7dca68cf785b7615bc3cda /doc/examples/decoding_encoding.c | |
| parent | cdfd61b78ba6026b51526661daad6cd708fab352 (diff) | |
| parent | 976f2e0a542e47aaf68ddbe001fb70a00bf96d99 (diff) | |
| download | ffmpeg-2c10833d5e4c055033eb89c0e10484919fe251a5.tar.gz | |
Merge commit '976f2e0a542e47aaf68ddbe001fb70a00bf96d99' into release/0.10
* commit '976f2e0a542e47aaf68ddbe001fb70a00bf96d99':
x86: Fix linking with some or all of yasm, mmx, optimizations disabled
Conflicts:
libavcodec/x86/mpegaudiodec_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/decoding_encoding.c')
0 files changed, 0 insertions, 0 deletions