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

JULIAN GARDNER joolzg at btinternet.com
Fri May 27 00:41:21 CEST 2011





----- 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.

joolz


More information about the ffmpeg-devel mailing list