diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-15 16:35:27 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-15 16:35:27 +0000 |
commit | c4c55a5e5722350ed2adb23c4fcba6676e61d23f (patch) | |
tree | f2ee538e31e0e0599cbfd64ea44f4d312712d05b | |
parent | 3b4e977c888229ac321f1229c1e46214a9ed4289 (diff) | |
parent | e7a24dbf9c98a7a391fa107725b4cc28b427cb37 (diff) | |
download | v4l2_codec2-android10-mainline-release.tar.gz |
Snap for 5470312 from e7a24dbf9c98a7a391fa107725b4cc28b427cb37 to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid10-mainline-releaseandroid10-mainline-a-releaseandroid10-gsi
Change-Id: I7b9e1120a3c0e64e6ab64317932030f893783cd7
-rw-r--r-- | cmds/codec2.cpp | 2 | ||||
-rw-r--r-- | tests/C2VDAComponent_test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmds/codec2.cpp b/cmds/codec2.cpp index 9458bd3..fc84c29 100644 --- a/cmds/codec2.cpp +++ b/cmds/codec2.cpp @@ -23,11 +23,11 @@ #include <media/DataSource.h> #include <media/ICrypto.h> #include <media/IMediaHTTPService.h> -#include <media/MediaExtractor.h> #include <media/MediaSource.h> #include <media/stagefright/DataSourceFactory.h> #include <media/stagefright/MediaDefs.h> #include <media/stagefright/MediaErrors.h> +#include <media/stagefright/MediaExtractor.h> #include <media/stagefright/MediaExtractorFactory.h> #include <media/stagefright/MetaData.h> #include <media/stagefright/Utils.h> diff --git a/tests/C2VDAComponent_test.cpp b/tests/C2VDAComponent_test.cpp index 6e5e645..4d387d4 100644 --- a/tests/C2VDAComponent_test.cpp +++ b/tests/C2VDAComponent_test.cpp @@ -24,11 +24,11 @@ #include <gtest/gtest.h> #include <media/DataSource.h> #include <media/IMediaHTTPService.h> -#include <media/MediaExtractor.h> #include <media/MediaSource.h> #include <media/stagefright/DataSourceFactory.h> #include <media/stagefright/MediaDefs.h> #include <media/stagefright/MediaErrors.h> +#include <media/stagefright/MediaExtractor.h> #include <media/stagefright/MediaExtractorFactory.h> #include <media/stagefright/MetaData.h> #include <media/stagefright/Utils.h> |