From: Romain Beauxis <toots@rastageeks.org> To: Thilo Borgmann <thilo.borgmann@mail.de> Cc: Marvin Scholz <epirat07@gmail.com>, FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Subject: Re: [FFmpeg-devel] [PATCH 1/4] Use appropriate method for device discovery, fix crash with bogus device index. Date: Mon, 31 Jan 2022 08:19:28 -0600 Message-ID: <CABWZ6OQqk=+fZRMCQMJ=N61wfE1W5FXJJ3zktq08r8rej2WxVw@mail.gmail.com> (raw) In-Reply-To: <5c568e1c-0467-5e75-ec1d-9cbbe8c991c0@mail.de> Le lun. 31 janv. 2022 à 04:11, Thilo Borgmann <thilo.borgmann@mail.de> a écrit : > > Hi, > > Am 30.01.22 um 18:30 schrieb toots@rastageeks.org: > > From: Romain Beauxis <toots@rastageeks.org> > > > > This updates the code for avfoundation to use modern device lookup APIs and also adds a check to avoid querying the video devices array beyound its maximum size. > > > > --- > > libavdevice/avfoundation.m | 71 ++++++++++++++++++++++++++++++-------- > > 1 file changed, 56 insertions(+), 15 deletions(-) > > > > diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m > > index 0cd6e646d5..d8bcd98f81 100644 > > --- a/libavdevice/avfoundation.m > > +++ b/libavdevice/avfoundation.m > > @@ -27,6 +27,7 @@ > > > > #import <AVFoundation/AVFoundation.h> > > #include <pthread.h> > > +#include <Availability.h> > > > > #include "libavutil/channel_layout.h" > > #include "libavutil/pixdesc.h" > > @@ -764,8 +765,34 @@ static int avf_read_header(AVFormatContext *s) > [...] > > the patch doesn't appear to be broken any more, though it does not apply to current HEAD > > Thilos-Mac-mini:FFmpeg borgmann$ git apply ../patches/avfoundation/\[PATCH\ 1_4\]\ Use\ appropriate\ method\ for\ device\ discovery\,\ fix\ crash\ with\ bogus\ device\ index.\ -\ toots\@ rastageeks.org\ -\ 2022-01-30\ 1830.eml > error: patch failed: libavdevice/avfoundation.m:27 > error: libavdevice/avfoundation.m: patch does not apply > > I don't see why it does not apply as the part around line 27 looks sane. Did you try to apply to HEAD? It does seem to apply here: https://patchwork.ffmpeg.org/project/ffmpeg/patch/20220130173045.32690-2-toots@rastageeks.org/ _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2022-01-31 14:19 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-30 17:30 [FFmpeg-devel] [PATCH 0/4] Cleanup avfoundation input toots 2022-01-30 17:30 ` [FFmpeg-devel] [PATCH 1/4] Use appropriate method for device discovery, fix crash with bogus device index toots 2022-01-31 10:10 ` Thilo Borgmann 2022-01-31 14:19 ` Romain Beauxis [this message] 2022-01-30 17:30 ` [FFmpeg-devel] [PATCH 2/4] libavdevice/avfoundation.m: Allow to select devices by unique ID toots 2022-01-30 17:30 ` [FFmpeg-devel] [PATCH 3/4] libavdevice/avfoundation.m: use setAudioSettings, extend supported formats toots 2022-01-30 17:30 ` [FFmpeg-devel] [PATCH 4/4] libavdevice/avfoundation.m: Replace mutex-based concurrency handling in avfoundation.m by a thread-safe fifo queue with maximum length toots
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to='CABWZ6OQqk=+fZRMCQMJ=N61wfE1W5FXJJ3zktq08r8rej2WxVw@mail.gmail.com' \ --to=toots@rastageeks.org \ --cc=epirat07@gmail.com \ --cc=ffmpeg-devel@ffmpeg.org \ --cc=thilo.borgmann@mail.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git