Merge commit '5ab03e41e553452118113d0c224fa32b325e45e5'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 00:58:31 +0000 (02:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 00:58:59 +0000 (02:58 +0200)
commit11ba0c82076dd4b22b5d28ff8004308f6ee99b4e
tree476c126544246e641707018adc0b12aecc042bef
parent3eae34d50fc52ff7b8367f9ade1cd189bfc1a221
parent5ab03e41e553452118113d0c224fa32b325e45e5
Merge commit '5ab03e41e553452118113d0c224fa32b325e45e5'

* commit '5ab03e41e553452118113d0c224fa32b325e45e5':
  x86: h264dsp: Fix link failure with optimizations disabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/h264dsp_init.c