tree a71b14addfee54a7ef72c46162d45b73af6a8ed6
parent 601e9b5afda42a19bfebf71f4bf3e4a30b01bb75
author Arne Coucheron <arco68@gmail.com> 1384080805 +0100
committer Arne Coucheron <arco68@gmail.com> 1384799846 +0100

frameworks/av: Fixup after squashed commit of CAF media features

 * Fixed makefiles and ifdefs
 * Remarked out one line in MPEG4Extractor.cpp due to compile error

Change-Id: I40a8b12f8ca3fe0f372d68b0e3cf02aa33ffe3c3