Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Diederick Niehorster <dcnieho@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Diederick Niehorster <dcnieho@gmail.com>
Subject: [FFmpeg-devel] [PATCH v4 09/22] avdevice/avdevice: clean up avdevice_capabilities_create
Date: Fri, 25 Mar 2022 15:10:28 +0100
Message-ID: <20220325141041.1748-10-dcnieho@gmail.com> (raw)
In-Reply-To: <20220325141041.1748-1-dcnieho@gmail.com>

Draw implementation in line with that of avdevice_list_devices

Signed-off-by: Diederick Niehorster <dcnieho@gmail.com>
---
 libavdevice/avdevice.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c
index 2000e63bb2..24e14b84c9 100644
--- a/libavdevice/avdevice.c
+++ b/libavdevice/avdevice.c
@@ -113,11 +113,14 @@ int avdevice_capabilities_create(AVDeviceCapabilitiesQuery **caps, AVFormatConte
                                  AVDictionary **device_options)
 {
     int ret;
-    av_assert0(s && caps);
+    av_assert0(s);
+    av_assert0(caps);
     av_assert0(s->iformat || s->oformat);
     if ((s->oformat && !s->oformat->create_device_capabilities) ||
-        (s->iformat && !s->iformat->create_device_capabilities))
+        (s->iformat && !s->iformat->create_device_capabilities)) {
+        *caps = NULL;
         return AVERROR(ENOSYS);
+    }
     *caps = av_mallocz(sizeof(**caps));
     if (!(*caps))
         return AVERROR(ENOMEM);
-- 
2.28.0.windows.1

_______________________________________________
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".

  parent reply	other threads:[~2022-03-25 14:12 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-25 14:10 [FFmpeg-devel] [PATCH v4 00/22] avdevice (mostly dshow) enhancements Diederick Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 01/22] avdevice/dshow: fix regression Diederick Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 02/22] avdevice: lock to minor version of avformat Diederick Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 03/22] avformat: add control_message function to AVInputFormat Diederick Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 04/22] avdevice/dshow: implement control_message interface Diederick Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 05/22] avdevice: add control message requesting to show config dialog Diederick Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 06/22] avdevice/dshow: accept show config dialog control message Diederick Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 07/22] avdevice/dshow: add config dialog command for crossbar and tv tuner Diederick Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 08/22] avdevice/avdevice: Revert "Deprecate AVDevice Capabilities API" Diederick Niehorster
2022-03-25 14:10 ` Diederick Niehorster [this message]
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 10/22] avdevice: capabilities API details no longer public Diederick Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 11/22] avutil/opt: document AVOptionRange min_value > max_value Diederick Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 12/22] avdevice: Add internal helpers for querying device capabilities Diederick Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 13/22] avdevice: change device capabilities option type Diederick Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 14/22] avdevice: improve capabilities' option API Diederick Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 15/22] avdevice/dshow: move audio format helpers Diederick Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 16/22] avdevice/dshow: when closing, set context fields back to zero Diederick Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 17/22] avdevice/dshow: implement capabilities API Diederick Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 18/22] avdevice/dshow: cosmetics Diederick Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 19/22] avformat: add avformat_alloc_input_context() Diederick Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 20/22] doc/examples: adding device_get_capabilities example Diederick Niehorster
2022-03-25 17:26   ` Michael Niedermayer
2022-03-25 21:19     ` Diederick C. Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 21/22] Makefile/examples: cosmetics Diederick Niehorster
2022-03-25 14:10 ` [FFmpeg-devel] [PATCH v4 22/22] avdevice/dshow: capabilities query also works on opened device Diederick Niehorster
2022-03-29  3:59 ` [FFmpeg-devel] [PATCH v4 00/22] avdevice (mostly dshow) enhancements Roger Pack

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=20220325141041.1748-10-dcnieho@gmail.com \
    --to=dcnieho@gmail.com \
    --cc=ffmpeg-devel@ffmpeg.org \
    /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