[FFmpeg-devel] git ffmpeg/Xbmc lockup

Kelly Anderson kelly at silka.with-linux.com
Sat Jan 7 19:17:10 CET 2012


On 01/07/2012 10:44 AM, Michael Niedermayer wrote:
> On Sat, Jan 07, 2012 at 10:07:00AM -0700, Kelly Anderson wrote:
>> On 01/07/2012 10:03 AM, Hendrik Leppkes wrote:
>>> Hi,
>>>> "git show d185278" and "git diff f5be84c..d185278" should be showing pretty
>>>> much the same commit.
>>>> But there's a whole bunch of crap that actually got changed when you see the
>>>> output of the git diff.
>>>>
>>> You can't take the chronological order as shown by the web interface
>>> as anything but an overview. The actual parent of d185278 is 4278023.
>>> The web interface sadly doesn't show the full truth, because of the
>>> merges from libav. Its not a linear history.
>> I'm using git log for my history.  So I'm not sure whether that's
>> linear or not.
> you can use
> git log --graph
> or
> git log --graph --pretty=oneline
> to see the parent/child relationship
> there are also various GUI tools that can do that
>
>
>> I'll apply that patch and see if fixes the problem.
> Please do, if it works ill push it to master

I just applied this patch with pthreads enabled and it seems to work.

  [PATCH] lavf: Do not attempt to use frame multi threading when probing.


>
> [...]
>
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel



More information about the ffmpeg-devel mailing list