Mon Jul 25 00:45:05 2022 UTC ()

mplayer: fix build with ffmpeg5-5.1


(tnn)

diff -r1.102 -r1.103 pkgsrc/multimedia/mplayer-share/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/mplayer-share/patches/patch-av__helpers.c

--- pkgsrc/multimedia/mplayer-share/distinfo 2022/04/24 15:00:42 1.102
+++ pkgsrc/multimedia/mplayer-share/distinfo 2022/07/25 00:45:05 1.103

 @@ -1,19 +1,20 @@
-$NetBSD: distinfo,v 1.102 2022/04/24 15:00:42 nia Exp $
+$NetBSD: distinfo,v 1.103 2022/07/25 00:45:05 tnn Exp $
 BLAKE2s (mplayer/MPlayer-1.5.tar.xz) = 1a86b823bcc82e07cf43551151449dd1cbdd768d8281ebe32cea6ced91d029c5
 SHA512 (mplayer/MPlayer-1.5.tar.xz) = 05fe1edf23cec53be676333b6299df4b3f1ee746e5ccd96dc0bed550e7a1602ba7ba182c1cc23fcac67aacde849a46628b1dcab8ee3d3d4117415c11b6a6ad74
 Size (mplayer/MPlayer-1.5.tar.xz) = 15379972 bytes
 SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83
 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
 SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
 SHA1 (patch-av__helpers.c) = c7821a3c4fb4cddc581ed1ee364c735c9680eb05
 SHA1 (patch-configure) = 70eee721bfb49e811d1b3c9376bdada5438f6b17
 SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c
 SHA1 (patch-libao2_ao__alsa.c) = da568da8b9290f1ed49ecedec7dc9141408698b1
 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
 SHA1 (patch-libvo_vo__corevideo.h) = c29a24266edb6727dda68a378fac413b5b0ab7ec
 SHA1 (patch-mplayer.c) = 8cfdca9d062d4a10320a0471c91dd7c264aa963c
 SHA1 (patch-stream_ai__alsa.c) = 1ed116931f4fde910c9bbe23680463a71631185c
 SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03
 SHA1 (patch-stream_dvbin.h) = ee4f74eb786100e7cc62be228d73ce29d88638d1
 SHA1 (patch-stream_stream__dvdnav.c) = 6f7e54629b32c83de8e4b31fe414b78f6043e0e8
 SHA1 (patch-sub_subreader.c) = 3ec0d3824b6e9fe34cb33e9463d833868f0b03c1

$NetBSD: patch-av__helpers.c,v 1.1 2022/07/25 00:45:05 tnn Exp $

Fix build with FFmpeg 5.1.
struct AVCodec.decode was removed in: 
https://github.com/FFmpeg/FFmpeg/commit/20f972701806be20a77f808db332d9489343bb78

--- av_helpers.c.orig	2021-05-01 17:45:31.000000000 +0000
+++ av_helpers.c
@@ -51,11 +51,9 @@ static void mp_msp_av_log_callback(void 
             AVCodecContext *s= ptr;
             if(s->codec){
                 if(s->codec->type == AVMEDIA_TYPE_AUDIO){
-                    if(s->codec->decode)
-                        type= MSGT_DECAUDIO;
+                    type= MSGT_DECAUDIO;
                 }else if(s->codec->type == AVMEDIA_TYPE_VIDEO){
-                    if(s->codec->decode)
-                        type= MSGT_DECVIDEO;
+                    type= MSGT_DECVIDEO;
                 }
                 //FIXME subtitles, encoders (what msgt for them? there is no appropriate ...)
             }