Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 24 Aug 2013 09:30:23 +0000 (11:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 24 Aug 2013 09:30:57 +0000 (11:30 +0200)
commit6067186f3a76691bc2c825c40312dc12a7483c0e
tree5364397b38b4ddf1b355d64c228ea69ad0e5bc6e
parentedf6fb64e07c277a1aad2cd0a57a9b4c1b33c29a
parentf407856968dcf4ff6c7240abe3afc17c00d81b46
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: h264chroma: Do not compile h264_chroma_mc* dependent on h264 decoder

Merged-by: Michael Niedermayer <michaelni@gmx.at>