Merge commit '70dd8892bf00923af838756dfbb356a9b1e4e40d'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 12:53:39 +0000 (14:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 12:53:44 +0000 (14:53 +0200)
commit8251529ff37e0fdfb4ee6ba74f14ebc200e0ae2f
treede72668e33d69ea1b5e6573686d549494342fe92
parent37494bdb0d42c222c302270f3a83e38ae2131887
parent70dd8892bf00923af838756dfbb356a9b1e4e40d
Merge commit '70dd8892bf00923af838756dfbb356a9b1e4e40d'

* commit '70dd8892bf00923af838756dfbb356a9b1e4e40d':
  mpegvideo: Replace arch initialization ifdeffery by standard conditionals

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