diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-03-04 16:21:18 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-03-04 16:22:43 +0000 |
| commit | 61c554bd5feee96bbb3ffe62b37b09c824f9287d (patch) | |
| tree | ab51aae3b177a3acd0a45d4d0366039776deae09 /libavcodec/libopencore-amr.c | |
| parent | 89790ba2bfc9d0dc5ad407c5724b6ee616ecde58 (diff) | |
| parent | 257b30af8ec520c1635092e429606c62d3bcca63 (diff) | |
| download | ffmpeg-61c554bd5feee96bbb3ffe62b37b09c824f9287d.tar.gz | |
Merge commit '257b30af8ec520c1635092e429606c62d3bcca63'
This commit is a no-op. We already have these, plus our asm differs.
* commit '257b30af8ec520c1635092e429606c62d3bcca63':
x86: hevc: Fix linking with both yasm and optimizations disabled
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/libopencore-amr.c')
0 files changed, 0 insertions, 0 deletions