Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa6d0d90 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am d71ab51a: Merge change I3e1bdd38 into eclair-mr2

Merge commit 'd71ab51a46d3648493ab3425e77e5762544be03a' into eclair-mr2-plus-aosp

* commit 'd71ab51a46d3648493ab3425e77e5762544be03a':
  Transcode files again.
parents 82594bed 73232491
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ sp<MediaSource> createSource(const char *filename) {
int main(int argc, char **argv) {
    android::ProcessState::self()->startThreadPool();

    DataSource::RegisterDefaultSniffers();

#if 1
    if (argc != 2) {
        fprintf(stderr, "usage: %s filename\n", argv[0]);
@@ -142,7 +144,7 @@ int main(int argc, char **argv) {
    OMXClient client;
    CHECK_EQ(client.connect(), OK);

#if 0
#if 1
    sp<MediaSource> source = createSource(argv[1]);

    if (source == NULL) {