This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch master
in repository ffmpeg.

commit d5b8439bdd968f3bea5f973ecb4d51b4325ee364
Author:     Andreas Rheinhardt <[email protected]>
AuthorDate: Wed Aug 12 22:10:31 2026 +0200
Commit:     Andreas Rheinhardt <[email protected]>
CommitDate: Sat Aug 15 22:40:43 2026 +0200

    avcodec/mips/hevcpred_msa: Fix compilation
    
    Broken in ba56a300a94bdf5520ac1324a8e7fbaeea430904,
    ba56a300a94bdf5520ac1324a8e7fbaeea430904 and again
    in 38b8ae4112684c3415ab2f7d717605759d764d27.
    
    This means that no has compiled git master on mips
    since 2024-06-04. And no one complained.
    
    Hint: One still needs to pass -flax-vector-conversions
    here in order to compile this file.
    
    Signed-off-by: Andreas Rheinhardt <[email protected]>
---
 libavcodec/mips/hevcpred_msa.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/libavcodec/mips/hevcpred_msa.c b/libavcodec/mips/hevcpred_msa.c
index a6824712a2..b7d67e9759 100644
--- a/libavcodec/mips/hevcpred_msa.c
+++ b/libavcodec/mips/hevcpred_msa.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/hevc/dec.h"
+#include "libavcodec/hevc/hevcdec.h"
 #include "libavutil/mips/generic_macros_msa.h"
 #include "hevcpred_mips.h"
 
@@ -1924,8 +1924,8 @@ void ff_intra_pred_8_16x16_msa(HEVCLocalContext *lc, 
const HEVCPPS *pps,
     int cur_tb_addr =
         pps->min_tb_addr_zs[(y_tb) * (sps->tb_mask + 2) + (x_tb)];
 
-    ptrdiff_t stride = s->frame->linesize[c_idx] / sizeof(uint8_t);
-    uint8_t *src = (uint8_t *) s->frame->data[c_idx] + x + y * stride;
+    ptrdiff_t stride = s->cur_frame->f->linesize[c_idx] / sizeof(uint8_t);
+    uint8_t *src = (uint8_t *) s->cur_frame->f->data[c_idx] + x + y * stride;
 
     int min_pu_width = sps->min_pu_width;
 
@@ -2416,7 +2416,8 @@ void ff_intra_pred_8_16x16_msa(HEVCLocalContext *lc, 
const HEVCPPS *pps,
     }
 }
 
-void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, int x0, int y0, int c_idx)
+void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, const HEVCPPS *pps,
+                               int x0, int y0, int c_idx)
 {
     v16u8 vec0, vec1;
     v8i16 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
@@ -2440,8 +2441,8 @@ void ff_intra_pred_8_32x32_msa(HEVCLocalContext *lc, int 
x0, int y0, int c_idx)
     int cur_tb_addr =
         pps->min_tb_addr_zs[(y_tb) * (sps->tb_mask + 2) + (x_tb)];
 
-    ptrdiff_t stride = s->frame->linesize[c_idx] / sizeof(uint8_t);
-    uint8_t *src = (uint8_t *) s->frame->data[c_idx] + x + y * stride;
+    ptrdiff_t stride = s->cur_frame->f->linesize[c_idx] / sizeof(uint8_t);
+    uint8_t *src = (uint8_t *) s->cur_frame->f->data[c_idx] + x + y * stride;
 
     int min_pu_width = sps->min_pu_width;
 

-- 
To stop receiving notification emails like this one, please contact
[email protected].
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to