This MR aims to add two custom property used by USE_OMX_TARGET_ZYNQ_USCALE_PLUS
This MR needs !44 (closed)
Step 1. Fetch and check out the branch for this merge request
-# All repo/branch refs have been quoted to allow support for special characters (such as #my-branch) git fetch "https://gitlab.freedesktop.org/dabrain34/gst-omx.git" "sce_add_couple_specific_props_zyng_upscale_plus" git checkout -b "dabrain34/gst-omx-sce_add_couple_specific_props_zyng_upscale_plus" FETCH_HEAD
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin git checkout "origin/master" git merge --no-ff "dabrain34/gst-omx-sce_add_couple_specific_props_zyng_upscale_plus"
Step 4. Push the result of the merge to GitLab
git push origin "master"
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.