diff options
author | Abhishek Arya <aarya@google.com> | 2015-08-18 16:47:00 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-18 16:47:00 +0000 |
commit | 8b0660e0b4335d1a594602715da92e7b52c66260 (patch) | |
tree | 194ff756bebca257cc5b685e37940744c3d5e8c7 /media/libstagefright/codecs | |
parent | 5d629bf257ee2568d665d2c1d2a5a9fcd15c1ece (diff) | |
parent | 3c803e7f777ad745b1b2cae0bdb2a31b11d47e80 (diff) | |
download | frameworks_av-8b0660e0b4335d1a594602715da92e7b52c66260.zip frameworks_av-8b0660e0b4335d1a594602715da92e7b52c66260.tar.gz frameworks_av-8b0660e0b4335d1a594602715da92e7b52c66260.tar.bz2 |
am 3c803e7f: am 6afd8574: am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev
* commit '3c803e7f777ad745b1b2cae0bdb2a31b11d47e80':
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
Diffstat (limited to 'media/libstagefright/codecs')
-rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp | 3 | ||||
-rw-r--r-- | media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp b/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp index eddc148..79e4e4f 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp +++ b/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp @@ -15,9 +15,6 @@ * and limitations under the License. * ------------------------------------------------------------------- */ - -#include <stdint.h> - #include "mp4dec_lib.h" #include "vlc_decode.h" #include "bitstream.h" diff --git a/media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp b/media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp index 6c4510e..c2b7c8d 100644 --- a/media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp +++ b/media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp @@ -16,8 +16,6 @@ * ------------------------------------------------------------------- */ -#include <stdint.h> - #include "mp4enc_lib.h" #include "bitstream_io.h" #include "rate_control.h" |