[FFmpeg-devel] [PATCH 3/4] avformat/format: Run image2 probe again when file content data is available

[Michael Niedermayer]

On Fri, Sep 12, 2014 at 04:20:30PM +0200, Benoit Fouet wrote:
> Hi,
> 
> ----- Mail original -----
> > On Fri, Sep 12, 2014 at 10:13:20AM +0200, Benoit Fouet wrote:
> > > Hi,
> > > 
> > > ----- Mail original -----
> > > > Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> > > > ---
> > > >  libavformat/format.c |    2 +-
> > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > > 
> > > > diff --git a/libavformat/format.c b/libavformat/format.c
> > > > index 828ab52..006cc87 100644
> > > > --- a/libavformat/format.c
> > > > +++ b/libavformat/format.c
> > > > @@ -202,7 +202,7 @@ AVInputFormat
> > > > *av_probe_input_format3(AVProbeData
> > > > *pd, int is_opened,
> > > >  
> > > >      fmt = NULL;
> > > >      while ((fmt1 = av_iformat_next(fmt1))) {
> > > > -        if (!is_opened == !(fmt1->flags & AVFMT_NOFILE))
> > > > +        if (!is_opened == !(fmt1->flags & AVFMT_NOFILE) &&
> > > > strcmp(fmt1->name, "image2"))
> > > > 
> > > 
> > > Wouldn't it be possible to add for instance another flag that tells
> > > this?
> > > AVFMT_PREFER_FILE or something like that (I don't like the name,
> > > just proposing so that what I say is clearer)?
> > 
> > great idea, patch posted
> > 
> 
> OK, as stated in the other patch thread, I no more agree with myself :-)
> So this one LGTM right now.

applied

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I have often repented speaking, but never of holding my tongue.
-- Xenocrates
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140912/df17ab74/attachment.asc>