[FFmpeg-cvslog] avdevice/dshow: only set pin format if wanted

Diederick Niehorster git at videolan.org
Tue Jan 4 14:13:59 EET 2022


ffmpeg | branch: master | Diederick Niehorster <dcnieho at gmail.com> | Sun Jan  2 10:49:39 2022 +0100| [25518f2aa6821cd37bb20b53853eb1b2ef95b755] | committer: Gyan Doshi

avdevice/dshow: only set pin format if wanted

Signed-off-by: Diederick Niehorster <dcnieho at gmail.com>
Reviewed-by: Roger Pack <rogerdpack2 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25518f2aa6821cd37bb20b53853eb1b2ef95b755
---

 libavdevice/dshow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
index 4b6887881d..f2d95fa470 100644
--- a/libavdevice/dshow.c
+++ b/libavdevice/dshow.c
@@ -1046,7 +1046,7 @@ next:
     // format based on the VIDEOINFOHEADER format.
     // NB: this never applies to an audio format because
     // previous_match_type always NULL in that case
-    if (!format_set && previous_match_type) {
+    if (pformat_set && !format_set && previous_match_type) {
         if (IAMStreamConfig_SetFormat(config, previous_match_type) == S_OK)
             format_set = 1;
     }



More information about the ffmpeg-cvslog mailing list