Merge commit 'bf7114b6caad8cf94696b0299c13b0d26bf291be'

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

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

libavutil/version.h

@@ -90,9 +90,6 @@
 #ifndef FF_API_CONTEXT_SIZE
 #define FF_API_CONTEXT_SIZE             (LIBAVUTIL_VERSION_MAJOR < 55)
 #endif
-#ifndef FF_API_CPU_FLAG_MMX2
-#define FF_API_CPU_FLAG_MMX2            (LIBAVUTIL_VERSION_MAJOR < 55)
-#endif
 #ifndef FF_API_LLS_PRIVATE
 #define FF_API_LLS_PRIVATE              (LIBAVUTIL_VERSION_MAJOR < 55)
 #endif