diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-12-07 23:13:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-07 23:13:13 -0500 |
| commit | 7761f298922e3f79c0edca53649b9576c1f42c33 (patch) | |
| tree | dcfd1994006b843f7abb918c458354c9c6bf2e5f /src | |
| parent | e92b10f971733d89ce4b0a9ffc782c13114e1eee (diff) | |
| parent | 4cd3f9f4f9cd17f92762fa41cec69074f7000ac0 (diff) | |
Merge pull request #11214 from lat9nq/ff-deprecated
codec: Update to use av frame flags
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/host1x/ffmpeg/ffmpeg.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/video_core/host1x/ffmpeg/ffmpeg.cpp b/src/video_core/host1x/ffmpeg/ffmpeg.cpp index dcd07e6d2..96686da59 100644 --- a/src/video_core/host1x/ffmpeg/ffmpeg.cpp +++ b/src/video_core/host1x/ffmpeg/ffmpeg.cpp @@ -233,7 +233,12 @@ std::unique_ptr<Frame> DecoderContext::ReceiveFrame(bool* out_is_interlaced) { return false; } - *out_is_interlaced = frame->interlaced_frame != 0; + *out_is_interlaced = +#if defined(FF_API_INTERLACED_FRAME) || LIBAVUTIL_VERSION_MAJOR >= 59 + (frame->flags & AV_FRAME_FLAG_INTERLACED) != 0; +#else + frame->interlaced_frame != 0; +#endif return true; }; |