[FFmpeg-devel] PATCH: dshow: don't add two instances of same device to graphs

[Michael Niedermayer]

On Tue, Jun 21, 2016 at 08:06:09AM -0600, Roger Pack wrote:
> On 6/17/16, Roger Pack <rogerdpack2 at gmail.com> wrote:
> > On 6/15/16, Clément Bœsch <u at pkh.me> wrote:
> >> On Wed, Jun 15, 2016 at 02:54:09AM -0600, Roger Pack wrote:
> >>> A handful of devices don't support this, and the rest work fine with it
> >>> :)
> >>>
> >>> -roger-
> >>
> >>> From e724d7f169bcae3217455cd88f9c023d275d367a Mon Sep 17 00:00:00 2001
> >>> From: rogerdpack <rogerpack2005 at gmail.com>
> >>> Date: Wed, 15 Jun 2016 02:17:11 -0600
> >>> Subject: [PATCH] dshow: don't add two instances of same device to graphs
> >>>
> >>> Signed-off-by: rogerdpack <rogerpack2005 at gmail.com>
> >>> ---
> >>>  libavdevice/dshow.c         | 37 ++++++++++++++++++++++++++++++-------
> >>>  libavdevice/dshow_capture.h |  2 ++
> >>>  2 files changed, 32 insertions(+), 7 deletions(-)
> >>>
> >>> diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
> >>> index 5f2cad7..e1ac855 100644
> >>> --- a/libavdevice/dshow.c
> >>> +++ b/libavdevice/dshow.c
> >>> @@ -108,6 +108,10 @@ dshow_read_close(AVFormatContext *s)
> >>>          av_freep(&ctx->device_name[0]);
> >>>      if (ctx->device_name[1])
> >>>          av_freep(&ctx->device_name[1]);
> >>
> >>> +    if (ctx->device_unique_name[0])
> >>> +        av_freep(&ctx->device_unique_name[0]);
> >>> +    if (ctx->device_unique_name[1])
> >>> +        av_freep(&ctx->device_unique_name[1]);
> >>
> >> I can't comment the rest of the patch, but please remove the ifs. They
> >> are,
> >> and always were, totally useless. Just like those above.
> >
> > OK see also attached patch, to be applied after patch 1.
> > Thanks, will wait three days and if no objections, request these
> > patches be committed.
> 
> OK would some kind soul please commit these for me?

applied

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I have never wished to cater to the crowd; for what I know they do not
approve, and what they approve I do not know. -- Epicurus
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160623/aeba8add/attachment.sig>