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)
commit58ebb39127da500ff1d54a059ecec0b344f113dd
tree37b2fc75452283faca3923052bd26275b72b7903
parentd9218011ef411c56073f63629842a1fa26454c75
parentbf7114b6caad8cf94696b0299c13b0d26bf291be
Merge commit 'bf7114b6caad8cf94696b0299c13b0d26bf291be'

* commit 'bf7114b6caad8cf94696b0299c13b0d26bf291be':
  lavu: Drop deprecated AV_CPU_FLAG_MMX2 symbol

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