On Tue, May 24, 2011 at 09:38:34AM -0400, Daniel Kang wrote:
> On Tue, May 24, 2011 at 9:25 AM, Ronald S. Bultje <[email protected]>wrote:
> 
> > On Tue, May 24, 2011 at 8:15 AM, Daniel Kang <[email protected]> 
> > wrote:
> > > diff --git a/libavcodec/h264dsp.h b/libavcodec/h264dsp.h
> >
> > All unrelated, but fine as a separate patch.
> >
> What is the best way to split this? I can't get "git gui" to unstage
> certain changes in the same file...

git add -p
git reset -p

Ask on IRC for help with all things git.

> > > @@ -840,7 +840,7 @@ cglobal h264_idct_add16intra_sse2, 5, 7, 8
> > >
> > >  ; ff_h264_idct_add8_sse2(uint8_t **dest, const int *block_offset,
> > >  ;                        DCTELEM *block, int stride, const uint8_t
> > nnzc[6*8])
> > > -cglobal h264_idct_add8_sse2, 5, 7, 8
> > > +cglobal h264_idct_add8_8_sse2, 5, 7, 8
> > >      add          r2, 512
> > >  %ifdef ARCH_X86_64
> > >      mov         r10, r0
> >
> > I'd recommend doing the 8bit to _8 renames in a separate patch also,
> > makes the actual patch a little smaller…
> >
> Can this stay in? Otherwise, once I'll fix it once I learn how to
> unstage changes in parts of files.

No, you shall learn to split patches now, it is an essential
skill anyway :-)

Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to