Merge commit '7d7355aa92bb36ca0765c49a569a999bcb96f332'

* commit '7d7355aa92bb36ca0765c49a569a999bcb96f332':
  x86: Add SSSE3_SLOW CPU flag and related convenience macros

Merged-by: James Almer <jamrial@gmail.com>

diff --cc doc/APIchanges
index 109d550573f57d09ee7a9aa8a61ad1e42ea3eeb3,1b65c4be1fe20ab5b6ac722324ff369c52f13918..8bca71ef36978a565de57a4534cad2ba6f186575
--- 1/doc/APIchanges
--- 2/doc/APIchanges
+++ b/doc/APIchanges
@@@ -15,40 -13,10 +15,43 @@@ libavutil:     2015-08-2
  
  API changes, most recent first:
  
 -2016-07-20 - xxxxxxx - lavu 55.20.0 - cpu.h
++2017-01-31 - xxxxxxx - lavu 55.46.100 / 55.20.0 - cpu.h
+   Add AV_CPU_FLAG_SSSE3SLOW.
+ 
 -2016-07-02 - 4926fa9 - lavu 55.19.0 - hwcontext_vaapi.h
 +2017-01-24 - xxxxxxx - lavu 55.45.100 - channel_layout.h
 +  Add av_get_extended_channel_layout()
 +
 +2017-01-22 - xxxxxxx - lavu 55.44.100 - lfg.h
 +  Add av_lfg_init_from_data().
 +
 +2017-01-xx - xxxxxxx - lavc 57.74.100 - vaapi.h
 +  Deprecate struct vaapi_context and the vaapi.h installed header.
 +  Callers should set AVCodecContext.hw_frames_ctx instead.
 +
 +2017-01-12 - xxxxxxx - lavfi 6.69.100- buffersink.h
 +  Add av_buffersink_get_*() functions.
 +
 +2017-01-06 - xxxxxxx - lavf 57.62.100- avio.h
 +  Add avio_get_dyn_buf()
 +
 +2016-12-10 - xxxxxxx - lavu xx.xx.100- imgutils.h
 +  Add av_image_check_size2()
 +
 +2016-xx-xx - xxxxxxx - lavc 57.67.100 / 57.29.0 - avcodec.h
 +  Add AV_PKT_DATA_SPHERICAL packet side data to export AVSphericalMapping
 +  information from containers.
 +
 +2016-xx-xx - xxxxxxx - lavu 55.42.100 / 55.30.0 - spherical.h
 +  Add AV_FRAME_DATA_SPHERICAL value, av_spherical_alloc() API and
 +  AVSphericalMapping type to export and describe spherical video properties.
 +
 +2016-11-18 - xxxxxxx - lavf 57.58.100 - avformat.h
 +  Add av_stream_add_side_data().
 +
 +2016-xx-xx - xxxxxxx - lavu 55.39.100 - hwcontext_vaapi.h
 +  Add AV_VAAPI_DRIVER_QUIRK_ATTRIB_MEMTYPE.
 +
 +2016-xx-xx - xxxxxxx - lavu 55.38.100 - hwcontext_vaapi.h
    Add driver quirks field to VAAPI-specific hwdevice and enum with
    members AV_VAAPI_DRIVER_QUIRK_* to represent its values.
  

diff --cc libavutil/cpu.h
Simple merge

diff --cc libavutil/version.h
index 9d95086ac61cc876f4c300c711e896cc55c75485,5cbc0e880eccba9fe92f20ad1f114a1e55d8ea6e..8866064aac4c168e41efbf4e86a7f5ed41ea15dc
--- 1/libavutil/version.h
--- 2/libavutil/version.h
+++ b/libavutil/version.h
@@@ -78,9 -53,9 +78,9 @@@
   * @{
   */
  
 -#define LIBAVUTIL_VERSION_MAJOR 55
 -#define LIBAVUTIL_VERSION_MINOR 20
 -#define LIBAVUTIL_VERSION_MICRO  0
 +#define LIBAVUTIL_VERSION_MAJOR  55
- #define LIBAVUTIL_VERSION_MINOR  45
++#define LIBAVUTIL_VERSION_MINOR  46
 +#define LIBAVUTIL_VERSION_MICRO 100
  
  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                 LIBAVUTIL_VERSION_MINOR, \

diff --cc libavutil/x86/cpu.h
Simple merge