SHOW:
|
|
- or go back to the newest paste.
| 1 | Applying: Add legacy Qualcomm OpenMAX support for MSM7x27 | |
| 2 | Using index info to reconstruct a base tree... | |
| 3 | Falling back to patching base and 3-way merge... | |
| 4 | Auto-merging media/libstagefright/colorconversion/SoftwareRenderer.cpp | |
| 5 | CONFLICT (content): Merge conflict in media/libstagefright/colorconversion/SoftwareRenderer.cpp | |
| 6 | Auto-merging media/libstagefright/colorconversion/Android.mk | |
| 7 | CONFLICT (content): Merge conflict in media/libstagefright/colorconversion/Android.mk | |
| 8 | Auto-merging media/libstagefright/OMXCodec.cpp | |
| 9 | Recorded preimage for 'media/libstagefright/colorconversion/Android.mk' | |
| 10 | Recorded preimage for 'media/libstagefright/colorconversion/SoftwareRenderer.cpp' | |
| 11 | Failed to merge in the changes. | |
| 12 | Patch failed at 0001 Add legacy Qualcomm OpenMAX support for MSM7x27 | |
| 13 | When you have resolved this problem run "git am --resolved". | |
| 14 | If you would prefer to skip this patch, instead run "git am --skip". | |
| 15 | - | To restore the original branch and stop patching run "git am --abort". |
| 15 | + | To restore the original branch and stop patching run "git am --abort". |
| 16 | razzmataz1478@virtualboingboing:~/skate/pac/frameworks/av$ git config --global rerere.enabled true | |
| 17 | razzmataz1478@virtualboingboing:~/skate/pac/frameworks/av$ git rerere status | |
| 18 | media/libstagefright/colorconversion/Android.mk | |
| 19 | media/libstagefright/colorconversion/SoftwareRenderer.cpp | |
| 20 | razzmataz1478@virtualboingboing:~/skate/pac/frameworks/av$ git rerere diff | |
| 21 | --- a/media/libstagefright/colorconversion/Android.mk | |
| 22 | +++ b/media/libstagefright/colorconversion/Android.mk | |
| 23 | @@ -14,11 +14,11 @@ | |
| 24 | endif | |
| 25 | ||
| 26 | ifeq ($(BOARD_USES_QCOM_HARDWARE),true) | |
| 27 | -<<<<<<< | |
| 28 | +<<<<<<< HEAD | |
| 29 | LOCAL_C_INCLUDES += $(TOP)/hardware/qcom/display/libgralloc | |
| 30 | ======= | |
| 31 | LOCAL_C_INCLUDES += $(TOP)/hardware/qcom/display/libgralloc | |
| 32 | ->>>>>>> | |
| 33 | +>>>>>>> Add legacy Qualcomm OpenMAX support for MSM7x27 | |
| 34 | endif | |
| 35 | ||
| 36 | LOCAL_MODULE:= libstagefright_color_conversion | |
| 37 | --- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp | |
| 38 | +++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp | |
| 39 | @@ -26,11 +26,11 @@ | |
| 40 | #include <ui/GraphicBufferMapper.h> | |
| 41 | #include <gui/ISurfaceTexture.h> | |
| 42 | ||
| 43 | -<<<<<<< | |
| 44 | +<<<<<<< HEAD | |
| 45 | #if defined(QCOM_LEGACY_OMX) && !defined(MISSING_GRALLOC_BUFFERS) | |
| 46 | ======= | |
| 47 | #ifdef QCOM_LEGACY_OMX | |
| 48 | ->>>>>>> | |
| 49 | +>>>>>>> Add legacy Qualcomm OpenMAX support for MSM7x27 | |
| 50 | #include <gralloc_priv.h> | |
| 51 | #endif | |
| 52 | ||
| 53 | @@ -134,11 +134,11 @@ | |
| 54 | mNativeWindow.get(), | |
| 55 | GRALLOC_USAGE_SW_READ_NEVER | GRALLOC_USAGE_SW_WRITE_OFTEN | |
| 56 | | GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_EXTERNAL_DISP | |
| 57 | -<<<<<<< | |
| 58 | +<<<<<<< HEAD | |
| 59 | #if defined(QCOM_LEGACY_OMX) && !defined(MISSING_GRALLOC_BUFFERS) | |
| 60 | ======= | |
| 61 | #ifdef QCOM_LEGACY_OMX | |
| 62 | ->>>>>>> | |
| 63 | +>>>>>>> Add legacy Qualcomm OpenMAX support for MSM7x27 | |
| 64 | | GRALLOC_USAGE_PRIVATE_ADSP_HEAP | GRALLOC_USAGE_PRIVATE_UNCACHED | |
| 65 | #endif | |
| 66 | )); |
