[FFmpeg-devel] [PATCH] pkt_pts reordering

[Stefano Sabatini]

On date Saturday 2011-01-08 15:35:53 +0100, Michael Niedermayer encoded:
> On Sat, Jan 08, 2011 at 12:07:56AM +0100, Michael Niedermayer wrote:
> > On Fri, Jan 07, 2011 at 10:16:14PM +0100, Stefano Sabatini wrote:
> > > On date Friday 2011-01-07 15:37:01 +0100, Michael Niedermayer encoded:
> [...]
> > [...]
> > > > @@ -628,6 +630,9 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi
> > > >      *got_picture_ptr= 0;
> > > >      if((avctx->coded_width||avctx->coded_height) && av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx))
> > > >          return -1;
> > > > +
> > > > +    avctx->pkt= avpkt;
> > > 
> > > Nit+++: avctx->pkt_= avpkt;
> > 
> > fixed some of the space nitpiks, again, i likely forgot some
> 
> btw, whats the quickest way to make changes to a previous git commit before
> dcommiting?

git rebase -i REV~1

where REV is the revision specifier for the commit you want to change.

If you are using git-svn and you branched from master, you can detect
all the commit in the new branch with the command:
base_rev=$(git log --pretty=oneline 'git-svn..' | tail -n1 | cut -d" " -f1)
then do
git rebase -i ${base_rev}~1

Then you mark the commit you want to change for editing, edit the
change and finally:
git rebase --continue

At this point you may need to resolve manually some conflicts, I
usually do like this:
git diff -> check which files need to be edited
edit edit edit...
git add EDITED_FILES
git rebase --continue

This is admittedly quite a bit of work even with scripting, maybe
someone can suggest a smarter way to do it.

> Ive just tried to fix these space nitpicks during rebase conflict resolution
> but (as i feared) i seem to have missed some that way.
-- 
FFmpeg = Faithless & Forgiving Mastodontic Perennial Elastic Gadget