Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03e90f7e authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 58e9402b: Merge "Properly assign LOG_TAGs in OMXMaster.cpp and... 

am 58e9402b: Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread

Merge commit '58e9402b' into gingerbread-plus-aosp

* commit '58e9402b':
  Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp
parents 800af390 58e9402b

media/libmedia/MediaScanner.cpp

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
 * limitations under the License.

 */



//#define LOG_NDEBUG 0

#define LOG_TAG "MediaScanner"

#include <utils/Log.h>



#include <media/mediascanner.h>



#include <sys/stat.h>

media/libstagefright/omx/OMXMaster.cpp

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
 * limitations under the License.

 */



//#define LOG_NDEBUG 0

#define LOG_TAG "OMXMaster"

#include <utils/Log.h>



#include "OMXMaster.h"



#include <dlfcn.h>