Merge pull request #7915 from HiassofT/le11-ffmpeg-12

[le11] ffmpeg: update rpi patch
This commit is contained in:
Jernej Škrabec 2023-06-13 19:35:51 +02:00 committed by GitHub
commit a54b88f19c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -53060,7 +53060,7 @@ index b67b216331..a506e69d67 100644
+ +
#endif /* AVCODEC_V4L2_M2M_H */ #endif /* AVCODEC_V4L2_M2M_H */
diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c
index ab07c0a24a..80d131eae4 100644 index ab07c0a24a..cec98cc16a 100644
--- a/libavcodec/v4l2_m2m_dec.c --- a/libavcodec/v4l2_m2m_dec.c
+++ b/libavcodec/v4l2_m2m_dec.c +++ b/libavcodec/v4l2_m2m_dec.c
@@ -21,8 +21,14 @@ @@ -21,8 +21,14 @@
@ -54123,9 +54123,9 @@ index ab07c0a24a..80d131eae4 100644
+ if (sps) { + if (sps) {
+ avctx->profile = ff_h264_get_profile(sps); + avctx->profile = ff_h264_get_profile(sps);
+ avctx->level = sps->level_idc; + avctx->level = sps->level_idc;
+ }
+ s->reorder_size = sps->num_reorder_frames; + s->reorder_size = sps->num_reorder_frames;
+ } + }
+ }
+ ff_h264_ps_uninit(&ps); + ff_h264_ps_uninit(&ps);
+ break; + break;
+ } + }