[FFmpeg-devel] [PATCHed] change PAT/PMT/SDT playout to be dependant on PTS and not a number of packets.

[Michael Niedermayer]

On Thu, May 26, 2011 at 11:41:21PM +0100, JULIAN GARDNER wrote:
> 
> 
> 
> 
> ----- Original Message -----
> > From: JULIAN GARDNER <joolzg at btinternet.com>
> > To: FFmpeg development discussions and patches <ffmpeg-devel at ffmpeg.org>
> > Cc: 
> > Sent: Tuesday, 24 May 2011, 15:19
> > Subject: Re: [FFmpeg-devel] [PATCHed] change PAT/PMT/SDT playout to be dependant on PTS and not a number of packets.
> > 
> > 
> > 
> > 
> > 
> > ----- Original Message -----
> >>  From: Michael Niedermayer <michaelni at gmx.at>
> >>  To: FFmpeg development discussions and patches 
> > <ffmpeg-devel at ffmpeg.org>
> >>  Cc: 
> >>  Sent: Tuesday, 24 May 2011, 15:15
> >>  Subject: Re: [FFmpeg-devel] [PATCHed] change PAT/PMT/SDT playout to be 
> > dependant on PTS and not a number of packets.
> >> 
> >>  On Tue, May 24, 2011 at 01:38:52PM +0100, JULIAN GARDNER wrote:
> >>  [...]
> >>>   ps. please not i dont know if this is all you need but i did a 
> > "git 
> >>  commit -a" the other day so i do a pull and i seem to gave no 
> > differences. 
> >>  Can some one tell me how to pull my other modifications that are still noy 
> > in 
> >>  the main tree, mainly my dvbsubtitle modifications.
> >> 
> >>  you should always use
> >>  git pull --rebase
> >>  not
> >>  git pull
> >> 
> >>  [...]
> >> 
> >>  -- 
> >>  Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
> >> 
> >>  I have often repented speaking, but never of holding my tongue.
> >>  -- Xenocrates
> >> 
> >>  _______________________________________________
> >>  ffmpeg-devel mailing list
> >>  ffmpeg-devel at ffmpeg.org
> >>  http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >> 
> > 
> > so anyway to fix it?
> > 
> > joolz
> > _______________________________________________
> > ffmpeg-devel mailing list
> > ffmpeg-devel at ffmpeg.org
> > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >
> 
> OK so ive moved over to a new machine and done a "git clone" and gone through my modifcations and have 5 files ready to you to be looked at, well 2 definately and 3 for dvbsubs which will get to you once i finish my task.
> 
> What i need to know is what is the correct way for me to carry on working on the files and being able to update my local without messing things up.

git pull --rebase

you also probably want to look at "git stash" which is helpfull to
move local changes out of the way (and back again) or you can just
commit local changes.

git format-patch -1 will turn the last commit into a patch with author
and commit message.
such patches can be applied with git am

also, most important is git <somecommand> --help


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

Frequently ignored awnser#1 FFmpeg bugs should be sent to our bugtracker. User
questions about the command line tools should be sent to the ffmpeg-user ML.
And questions about how to use libav* should be sent to the libav-user ML.
-------------- 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/20110527/a57a07fb/attachment.asc>