aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTrevor Johns <trevorjohns@google.com>2013-10-28 15:41:52 -0700
committerTrevor Johns <trevorjohns@google.com>2013-10-28 15:41:52 -0700
commita50166544715c20d21a41f9d029787e1ecbc99a4 (patch)
tree3d33e3ee92a92000f721be6c5d93609a0e820d82 /common
parent20ee7358f5e228bcaa0b6daf1888aebdb30556a5 (diff)
downloadandroid-a50166544715c20d21a41f9d029787e1ecbc99a4.tar.gz
BasicMediaDecoder: Use new build system
Migrate BasicMediaDecoder to use new templatized build system for conformity with other samples. Also moved common/src/com/example/android/common/media to common/src/java/com/example/android/common/media, in order to make it visible to the template system. Change-Id: I11613d27bb61f45b92893cfd08b70f788fdc1fc1
Diffstat (limited to 'common')
-rw-r--r--common/assets/video/vid_bigbuckbunny.mp4bin5510872 -> 0 bytes
-rw-r--r--common/src/java/com/example/android/common/media/CameraHelper.java (renamed from common/src/com/example/android/common/media/CameraHelper.java)0
-rw-r--r--common/src/java/com/example/android/common/media/MediaCodecWrapper.java (renamed from common/src/com/example/android/common/media/MediaCodecWrapper.java)0
3 files changed, 0 insertions, 0 deletions
diff --git a/common/assets/video/vid_bigbuckbunny.mp4 b/common/assets/video/vid_bigbuckbunny.mp4
deleted file mode 100644
index 81d11df5..00000000
--- a/common/assets/video/vid_bigbuckbunny.mp4
+++ /dev/null
Binary files differ
diff --git a/common/src/com/example/android/common/media/CameraHelper.java b/common/src/java/com/example/android/common/media/CameraHelper.java
index 1fa84167..1fa84167 100644
--- a/common/src/com/example/android/common/media/CameraHelper.java
+++ b/common/src/java/com/example/android/common/media/CameraHelper.java
diff --git a/common/src/com/example/android/common/media/MediaCodecWrapper.java b/common/src/java/com/example/android/common/media/MediaCodecWrapper.java
index a511221f..a511221f 100644
--- a/common/src/com/example/android/common/media/MediaCodecWrapper.java
+++ b/common/src/java/com/example/android/common/media/MediaCodecWrapper.java