Merge "NdkMediaCodec: fix AMediaCodec_configure to keep input format constant."

        uint32_t flags) {

    sp<AMessage> nativeFormat;

    AMediaFormat_getFormat(format, &nativeFormat);

    ALOGV("configure with format: %s", nativeFormat->debugString(0).c_str());

    // create our shallow copy, so we aren't victim to any later changes.

    sp<AMessage> dupNativeFormat = nativeFormat->dup();

    ALOGV("configure with format: %s", dupNativeFormat->debugString(0).c_str());

    sp<Surface> surface = NULL;

    if (window != NULL) {

        surface = (Surface*) window;

    }

    status_t err = mData->mCodec->configure(nativeFormat, surface,

    status_t err = mData->mCodec->configure(dupNativeFormat, surface,

            crypto ? crypto->mCrypto : NULL, flags);

    if (err != OK) {

        ALOGE("configure: err(%d), failed with format: %s",

              err, nativeFormat->debugString(0).c_str());

              err, dupNativeFormat->debugString(0).c_str());

    }

    return translate_error(err);

}