Merge "HTTPDataSource must be connected before it is usable. Fix this in the stagefright tool."

        sp<DataSource> dataSource;

        if (!strncasecmp("http://", filename, 7)) {

            dataSource = new HTTPDataSource(filename);

            dataSource = new CachingDataSource(dataSource, 64 * 1024, 10);

            if (((HTTPDataSource *)dataSource.get())->connect() != OK) {

                fprintf(stderr, "failed to connect to HTTP server.\n");

                return -1;

            }

            dataSource = new CachingDataSource(dataSource, 32 * 1024, 20);

        } else {

            dataSource = new FileSource(filename);

        }