[FFmpeg-devel] [HACK] mov.c: Handle MPEG-in-MOV (#241 and friends)

[Petter Ericson]

On Thu, Oct 18, 2012 at 07:51:08PM +0200, Michael Niedermayer wrote:
> On Thu, Oct 18, 2012 at 09:54:25AM +0200, Petter Ericson wrote:
> > Strike three, then.
> > 
> > On Wed, Oct 17, 2012 at 05:48:37PM +0200, Michael Niedermayer wrote:
> > > On Wed, Oct 17, 2012 at 05:35:11PM +0200, Petter Ericson wrote:
> > > > On Wed, Oct 17, 2012 at 05:15:20PM +0200, Michael Niedermayer wrote:
> > > > > On Wed, Oct 17, 2012 at 05:04:07PM +0200, Petter Ericson wrote:
> > > > > > On Wed, Oct 17, 2012 at 02:35:07AM +0200, Michael Niedermayer wrote:
> > > > > > > On Tue, Oct 16, 2012 at 09:33:24PM +0200, Petter Ericson wrote:
> > > > > > > > On Tue, Oct 16, 2012 at 06:43:50PM +0200, Hendrik Leppkes wrote:
> > > > > > > > > On Tue, Oct 16, 2012 at 5:18 PM, Petter Ericson
> > > > > > > > > <petter.ericson at codemill.se> wrote:
> > > > > > > > > > Greetings,
> > > [...]
> > > >  mov.c |   50 +++++++++++++++++++++++++++++++++++++++++++-------
> > > >  1 file changed, 43 insertions(+), 7 deletions(-)
> > > > e6c017cc3510726ce8841b29a00899812c1520a0  0001-mov.c.patch
> > > > From dd0c50b40e7264c9c3d22b010f0f10831aede88f Mon Sep 17 00:00:00 2001
> > > > From: Petter Ericson <petter.ericson at codemill.se>
> > > > Date: Wed, 17 Oct 2012 16:53:19 +0200
> > > > Subject: [PATCH] mov.c:     Check for stsd + m1s tag indicating MOV-wrapped
> > > >  MPEG-PS, and force 	continued probing if found.
> > > > 
> > > > ---
> > > >  libavformat/mov.c |   50 +++++++++++++++++++++++++++++++++++++++++++-------
> > > >  1 file changed, 43 insertions(+), 7 deletions(-)
> > > > 
> > > > diff --git a/libavformat/mov.c b/libavformat/mov.c
> > > > index b817bc9..e93356f 100644
> > > > --- a/libavformat/mov.c
> > > > +++ b/libavformat/mov.c
> > > > @@ -2861,43 +2861,79 @@ static int mov_probe(AVProbeData *p)
> > > >      unsigned int offset;
> > > >      uint32_t tag;
> > > >      int score = 0;
> > > 
> > > > +    int stsd = MKTAG('s','t','s','d');
> > > 
> > > thats not making the code clearar, its used just once
> > > 
> > 
> > Agreed - fixed.
> [...]
> > Reformatted this section a bit. Placed the checks together, and keeps
> > going if stsd is found without the other values being present.
> 
> did you plan to attach something ?
> iam asking because it appears from here, that you did not

Oh fer...

See attached.

Apologies.

/P

-- 
Petter Ericson
Systems developer, Codemill AB
petter.ericson at codemill.se

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-mov.c.patch
Type: text/x-diff
Size: 3973 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20121018/f6606118/attachment.bin>