summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorBasavapatna Dattaguru <dattaguru@google.com>2011-02-13 12:52:15 -0800
committerBasavapatna Dattaguru <dattaguru@google.com>2011-02-13 16:54:51 -0800
commitfc04c1d67e28e86cf764fb6163904bac5c6b5b10 (patch)
treee1db2bdf178f68c0480cfa30440055335b65c4da /media
parentb27a1ca53e43c97d206d19c2b219f53690b324eb (diff)
downloadframeworks_base-fc04c1d67e28e86cf764fb6163904bac5c6b5b10.zip
frameworks_base-fc04c1d67e28e86cf764fb6163904bac5c6b5b10.tar.gz
frameworks_base-fc04c1d67e28e86cf764fb6163904bac5c6b5b10.tar.bz2
VideoEditor: Issue ID:3396697 Missing Files added
IMG_640x480_Overlay2: dimension correction done Change-Id: I40960a44584fb27538d7e22829d293a34c654df7
Diffstat (limited to 'media')
-rwxr-xr-xmedia/tests/contents/media_api/videoeditor/H264_BP_960x720_25fps_800kbps_AACLC_48Khz_192Kbps_s_1_17.mp4bin0 -> 9599091 bytes
-rwxr-xr-x[-rw-r--r--]media/tests/contents/media_api/videoeditor/IMG_640x480_Overlay2.pngbin10563 -> 4559 bytes
-rw-r--r--media/tests/contents/media_api/videoeditor/MPEG4_SP_176x144_30fps_256kbps_AACLC_96kbps_44kHz_s_1_17.3gpbin3414405 -> 0 bytes
-rw-r--r--media/tests/contents/media_api/videoeditor/Text_FileRenamedTo3gp.3gp1
4 files changed, 1 insertions, 0 deletions
diff --git a/media/tests/contents/media_api/videoeditor/H264_BP_960x720_25fps_800kbps_AACLC_48Khz_192Kbps_s_1_17.mp4 b/media/tests/contents/media_api/videoeditor/H264_BP_960x720_25fps_800kbps_AACLC_48Khz_192Kbps_s_1_17.mp4
new file mode 100755
index 0000000..be050dc
--- /dev/null
+++ b/media/tests/contents/media_api/videoeditor/H264_BP_960x720_25fps_800kbps_AACLC_48Khz_192Kbps_s_1_17.mp4
Binary files differ
diff --git a/media/tests/contents/media_api/videoeditor/IMG_640x480_Overlay2.png b/media/tests/contents/media_api/videoeditor/IMG_640x480_Overlay2.png
index 6611986..0f32131a 100644..100755
--- a/media/tests/contents/media_api/videoeditor/IMG_640x480_Overlay2.png
+++ b/media/tests/contents/media_api/videoeditor/IMG_640x480_Overlay2.png
Binary files differ
diff --git a/media/tests/contents/media_api/videoeditor/MPEG4_SP_176x144_30fps_256kbps_AACLC_96kbps_44kHz_s_1_17.3gp b/media/tests/contents/media_api/videoeditor/MPEG4_SP_176x144_30fps_256kbps_AACLC_96kbps_44kHz_s_1_17.3gp
deleted file mode 100644
index bd8b079..0000000
--- a/media/tests/contents/media_api/videoeditor/MPEG4_SP_176x144_30fps_256kbps_AACLC_96kbps_44kHz_s_1_17.3gp
+++ /dev/null
Binary files differ
diff --git a/media/tests/contents/media_api/videoeditor/Text_FileRenamedTo3gp.3gp b/media/tests/contents/media_api/videoeditor/Text_FileRenamedTo3gp.3gp
new file mode 100644
index 0000000..02103c6
--- /dev/null
+++ b/media/tests/contents/media_api/videoeditor/Text_FileRenamedTo3gp.3gp
@@ -0,0 +1 @@
+This is a text file \ No newline at end of file