Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 02:13:54 +0000 (03:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 02:13:54 +0000 (03:13 +0100)
commitadc09a353c5ff467fdc924373e2ee1faf703b3b3
treed4568558c2c9e6dc442aff39941d3147b1df63f6
parent9b9f64fe315ca7a7a8b9517ab5c082ecb8b698be
parenta3a55645f09fd4b5e491ed29ae4bddda4c2d41a5
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: remove disabled bfin asm

Conflicts:
libavcodec/bfin/mpegvideo_bfin.c

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