commit c450cd0db67efb6160c2f4c51b83768b445f5d19
author Andreas Huber <andih@google.com> Wed Jun 23 10:31:43 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 23 10:31:43 2010 -0700
tree 41bba697946c564e802171e4bd599f9278b6a4e1
parent fc667dabcfec3d1903b0058aff158bd7b687ab4d
parent 235073a549ec664caea93e0ccded95e4a6819b6b

am 235073a5: am 8a42f881: Merge "Make sure sine: is supported again in stagefright commandline tool." into gingerbread

Merge commit '235073a549ec664caea93e0ccded95e4a6819b6b'

* commit '235073a549ec664caea93e0ccded95e4a6819b6b':
  Make sure sine: is supported again in stagefright commandline tool.

cmds/stagefright/stagefright.cpp

diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp
index e2ad9e6..877b908 100644
--- a/cmds/stagefright/stagefright.cpp
+++ b/cmds/stagefright/stagefright.cpp
@@ -483,7 +483,7 @@
 
         sp<DataSource> dataSource = DataSource::CreateFromURI(filename);
 
-        if (dataSource == NULL) {
+        if (strncasecmp(filename, "sine:", 5) && dataSource == NULL) {
             fprintf(stderr, "Unable to create data source.\n");
             return 1;
         }