commit 073a656d7dd0b432e7c8d508745d9fb552955b9e
author Abhishek Arya <aarya@google.com> Tue Aug 18 01:45:49 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 18 01:45:49 2015 +0000
tree e869c8904fae46cd6a7624e01bb04b7a69f39e68
parent af46239a10921980f5030222dff147a592480248
parent deba0610c89d54390c9d2d0a0f3b79fd7679779c

am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev

* commit 'deba0610c89d54390c9d2d0a0f3b79fd7679779c':
  Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"

media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp

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 b1a39e6..419e3f4 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"

media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp

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"