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

[Michael Niedermayer]

On Tue, May 24, 2011 at 02:19:10PM +0100, JULIAN GARDNER wrote:
> 
> 
> 
> 
> ----- 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?

If git pull is the last thing you did 
 git reset --merge ORIG_HEAD
should undo it
if its not the last thing i suggest you make a backup first, just in
case it eats something more than intended


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

If a bugfix only changes things apparently unrelated to the bug with no
further explanation, that is a good sign that the bugfix is wrong.
-------------- 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/20110524/da3f959e/attachment.asc>