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)
* commit '70dd8892bf00923af838756dfbb356a9b1e4e40d':
  mpegvideo: Replace arch initialization ifdeffery by standard conditionals

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

Simple merge