summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-23 22:32:51 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-23 22:35:23 +0100
commit09824332534990be7d08c5cdcebdcd5926e0a739 (patch)
tree6929e67a5068d4333aa971af67511bb5852e6a07
parent38336f0fb10a0a1dbcbbf371d0ab90520cee29c0 (diff)
parent10b0161d78148f46eaffb29ea022378947eaef2c (diff)
downloadffmpeg-streaming-09824332534990be7d08c5cdcebdcd5926e0a739.zip
ffmpeg-streaming-09824332534990be7d08c5cdcebdcd5926e0a739.tar.gz
Merge commit '10b0161d78148f46eaffb29ea022378947eaef2c'
* commit '10b0161d78148f46eaffb29ea022378947eaef2c': x86: add missing XOP checks and macros Conflicts: configure libavutil/x86/cpu.h See: 6c12b1de064d2604d19cb4c238a788cfed9679ac Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud