Merge "Add NOTICE and MODULE_LICENSE_APATCH2 to libvideoeditor" into jb-dev
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 4bf2d3f..c47fbd6 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -1679,6 +1679,7 @@
mNextOutput->mSampleRateHz = mSampleRateHz;
mNextOutput->mMsecsPerFrame = mMsecsPerFrame;
mNextOutput->mBytesWritten = mBytesWritten;
+ mNextOutput->mFlags = mFlags;
}
}
diff --git a/media/libstagefright/codecs/aacdec/Android.mk b/media/libstagefright/codecs/aacdec/Android.mk
index 1b2544a..91457c5 100644
--- a/media/libstagefright/codecs/aacdec/Android.mk
+++ b/media/libstagefright/codecs/aacdec/Android.mk
@@ -20,8 +20,7 @@
LOCAL_CFLAGS :=
- LOCAL_STATIC_LIBRARIES := \
- libAACdec libMpegTPDec libSBRdec libPCMutils libFDK libSYS
+ LOCAL_STATIC_LIBRARIES := libFraunhoferAAC
LOCAL_SHARED_LIBRARIES := \
libstagefright_omx libstagefright_foundation libutils libcutils
diff --git a/media/libstagefright/codecs/aacenc/Android.mk b/media/libstagefright/codecs/aacenc/Android.mk
index 98e702e..1c342c8 100644
--- a/media/libstagefright/codecs/aacenc/Android.mk
+++ b/media/libstagefright/codecs/aacenc/Android.mk
@@ -108,8 +108,7 @@
LOCAL_CFLAGS :=
- LOCAL_STATIC_LIBRARIES := \
- libAACenc libMpegTPEnc libSBRenc libFDK libSYS
+ LOCAL_STATIC_LIBRARIES := libFraunhoferAAC
LOCAL_SHARED_LIBRARIES := \
libstagefright_omx libstagefright_foundation libutils