Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update FFmpeg build guide and update DALI_deps version #2911

Merged
merged 4 commits into from
May 7, 2021

Conversation

JanuszL
Copy link
Contributor

@JanuszL JanuszL commented Apr 29, 2021

Signed-off-by: Janusz Lisiecki jlisiecki@nvidia.com

Why we need this PR?

Pick one, remove the rest

  • It update FFmpeg build guide and update DALI_deps version

What happened in this PR?

Fill relevant points, put NA otherwise. Replace anything inside []

  • What solution was applied:
    updates FFmpeg build guide to avoid FFmpeg symbol clash
    updates DALI_deps version
  • Affected modules and functionalities:
    documentation
    DALI_deps
  • Key points relevant for the review:
    NA
  • Validation and testing:
    CI
  • Documentation (including examples):
    docs are updates

JIRA TASK: [DALI-2008]

@dali-automaton
Copy link
Collaborator

CI MESSAGE: [2318227]: BUILD STARTED

@dali-automaton
Copy link
Collaborator

CI MESSAGE: [2318227]: BUILD PASSED

Signed-off-by: Janusz Lisiecki <jlisiecki@nvidia.com>
@dali-automaton
Copy link
Collaborator

CI MESSAGE: [2322186]: BUILD STARTED

Signed-off-by: Janusz Lisiecki <jlisiecki@nvidia.com>
@dali-automaton
Copy link
Collaborator

CI MESSAGE: [2322186]: BUILD PASSED

@@ -256,6 +256,7 @@ For the recommended dependency versions please check https://github.com/NVIDIA/D
--disable-filters \
--disable-bsfs \
--enable-bsf=h264_mp4toannexb,hevc_mp4toannexb,mpeg4_unpack_bframes && \
sed -i 's/\$\$(M)sed '\''s\/MAJOR\/\$(lib$(NAME)_VERSION_MAJOR)\/'\'' \$\$< | \$(VERSION_SCRIPT_POSTPROCESS_CMD) > \$\$\@/\$\$(M)sed '\''s\/MAJOR\/\$(lib$(NAME)_VERSION_MAJOR)\/'\'' \$\$< | sed '\''s\/\\(\.*{\\)\/DALI_\\1\/'\'' | \$(VERSION_SCRIPT_POSTPROCESS_CMD) > \$\$\@/' ffbuild/library.mak \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe you can add the comment as well

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Signed-off-by: Janusz Lisiecki <jlisiecki@nvidia.com>
@dali-automaton
Copy link
Collaborator

CI MESSAGE: [2341211]: BUILD STARTED

@dali-automaton
Copy link
Collaborator

CI MESSAGE: [2341211]: BUILD FAILED

Signed-off-by: Janusz Lisiecki <jlisiecki@nvidia.com>
@dali-automaton
Copy link
Collaborator

CI MESSAGE: [2341347]: BUILD STARTED

@dali-automaton
Copy link
Collaborator

CI MESSAGE: [2341347]: BUILD FAILED

@dali-automaton
Copy link
Collaborator

CI MESSAGE: [2341347]: BUILD PASSED

@jantonguirao jantonguirao assigned awolant and unassigned klecki May 7, 2021
@JanuszL JanuszL merged commit 8172932 into NVIDIA:master May 7, 2021
@JanuszL JanuszL deleted the bump_dali_deps branch May 7, 2021 15:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants