diff options
| author | Abhishek Arya <aarya@google.com> | 2015-08-20 01:16:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 01:16:14 +0000 |
| commit | 3e15e6d738d02efb4108251cdc75240569916b69 (patch) | |
| tree | 9d3d21842e1402b5a8ca1749ac42db7c1ab0f71e /media/libstagefright/codecs | |
| parent | 39f239932e94cb47a984ce50393beba5d5a8564a (diff) | |
| parent | 6e2dd5874a9ee2eccb339187a936ef38dfa8634b (diff) | |
| download | frameworks_av-3e15e6d738d02efb4108251cdc75240569916b69.zip frameworks_av-3e15e6d738d02efb4108251cdc75240569916b69.tar.gz frameworks_av-3e15e6d738d02efb4108251cdc75240569916b69.tar.bz2 | |
am 6e2dd587: am 8b0660e0: am 3c803e7f: am 6afd8574: am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev
* commit '6e2dd5874a9ee2eccb339187a936ef38dfa8634b':
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" |