Skip to content

Back-port for FFMPEG versions guard fix for AV_CODEC_FLAG_GLOBAL_HEADER and AVDISCARD_NONINTRA#18185

Merged
opencv-pushbot merged 2 commits intoopencv:3.4from
VadimLevin:dev/vlevin/ffmpeg-versions-guard-fix
Aug 25, 2020
Merged

Back-port for FFMPEG versions guard fix for AV_CODEC_FLAG_GLOBAL_HEADER and AVDISCARD_NONINTRA#18185
opencv-pushbot merged 2 commits intoopencv:3.4from
VadimLevin:dev/vlevin/ffmpeg-versions-guard-fix

Conversation

@VadimLevin
Copy link
Copy Markdown
Contributor

@VadimLevin VadimLevin commented Aug 24, 2020 •
edited by alalek
Loading

Back-port of fixes for libavcodec version checks found during #18146 .

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • There is reference to original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake
allow_multiple_commits=1

@VadimLevin VadimLevin requested a review from alalek August 24, 2020 20:20
alalek
alalek approved these changes Aug 25, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

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

Thank you!

@opencv-pushbot opencv-pushbot merged commit 75e88d6 into opencv:3.4 Aug 25, 2020
@alalek alalek mentioned this pull request Aug 26, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

category: videoio port/backport done Label for maintainers. Authors of PR can ignore this

Projects

None yet

Milestone

3.4.12

Development

Successfully merging this pull request may close these issues.

3 participants

@VadimLevin @alalek @opencv-pushbot