Merge commit '4a081f224e12f4227ae966bcbdd5384f22121ecf'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 16:30:33 +0000 (17:30 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 16:30:33 +0000 (17:30 +0100)
* commit '4a081f224e12f4227ae966bcbdd5384f22121ecf':
  libavcodec: fix constness in clobber test avcodec_open2() wrappers

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/x86/w64xmmtest.c

Simple merge