[FFmpeg-devel] [PATCH 2/2] mxfenc: support dnxhd codec

[Michael Niedermayer]

On Thu, Jul 05, 2012 at 11:09:21AM +0200, Matthieu Bouron wrote:
> On Mon, Jul 02, 2012 at 07:14:29PM +0200, Michael Niedermayer wrote:
> > On Mon, Jul 02, 2012 at 04:30:48PM +0200, Tomas Härdin wrote:
> > > On Sat, 2012-06-30 at 00:44 +0200, Matthieu Bouron wrote:
> > > > > +    switch (cid) {
> > > > > +    case 1235:
> > > > > +        sc->index = 24;
> > > > > +        sc->component_depth = 10;
> > > > > +        break;
> > > > > +    case 1237:
> > > > > +        sc->index = 25;
> > > > > +        break;
> > > > > +    case 1238:
> > > > > +        sc->index = 26;
> > > > > +        break;
> > > > > +    case 1241:
> > > > > +        sc->index = 27;
> > > > > +        sc->component_depth = 10;
> > > > > +        break;
> > > > > +    case 1242:
> > > > > +        sc->index = 28;
> > > > > +        break;
> > > > > +    case 1243:
> > > > > +        sc->index = 29;
> > > > > +        break;
> > > > > +    case 1250:
> > > > > +        sc->index = 30;
> > > > > +        sc->component_depth = 10;
> > > > > +        break;
> > > > > +    case 1251:
> > > > > +        sc->index = 31;
> > > > > +        break;
> > > > > +    case 1252:
> > > > > +        sc->index = 32;
> > > > > +        break;
> > > > > +    case 1253:
> > > > > +        sc->index = 33;
> > > > > +        break;
> > > > > +    default:
> > > > > +        return -1;
> > > > > +    }
> > > 
> > > I did a quick double-check against RP224 for these (cid vs UL indexed)
> > > and they seem correct (more of a note).
> > > 
> > > The patch looks OK to me.
> > 
> > cant apply this before 1/2
> > 
> > Applying: mxfenc: support dnxhd codec
> > error: patch failed: libavformat/mxfenc.c:95
> > error: libavformat/mxfenc.c: patch does not apply
> > Patch failed at 0001 mxfenc: support dnxhd codec
> > When you have resolved this problem run "git am --resolved".
> > If you would prefer to skip this patch, instead run "git am --skip".
> > To restore the original branch and stop patching run "git am --abort".
> > 
> 
> Ping

do you have a public git branch i can merge for these patches ?

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The real ebay dictionary, page 1
"Used only once"    - "Some unspecified defect prevented a second use"
"In good condition" - "Can be repaird by experienced expert"
"As is" - "You wouldnt want it even if you were payed for it, if you knew ..."
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20120705/d024aa00/attachment.asc>