Merge commit 'bf7114b6caad8cf94696b0299c13b0d26bf291be'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 15:19:50 +0000 (17:19 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 15:19:50 +0000 (17:19 +0200)
* commit 'bf7114b6caad8cf94696b0299c13b0d26bf291be':
  lavu: Drop deprecated AV_CPU_FLAG_MMX2 symbol

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavutil/version.h

Simple merge