[FFmpeg-devel] git ffmpeg/Xbmc lockup

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


On 01/07/2012 09:09 AM, Paul B Mahol wrote:
> On 1/7/12, Kelly Anderson<kelly at silka.with-linux.com>  wrote:
>> On 01/07/2012 08:19 AM, Kelly Anderson wrote:
>>> I know I've done this before...so I'm kinda frustrated it doesn't seem
>>> to be working.
>>> I just want to get the diff for commit
>>> d185278c369e9150fe6b4cf730405753384bca93.
>>> The previous commit was f5be84cfbc9c132a867ae8a8c0e0de26ed1a4e88.
>>>
>>> So either of the following should work, right?
>>>
>>> git diff f5be84c..d185278
>>> git diff
>>> f5be84cfbc9c132a867ae8a8c0e0de26ed1a4e88..d185278c369e9150fe6b4cf730405753384bca93
>>>
>>> What I'm getting for output is a whole lot of stuff that doesn't
>>> pertain to that commit.
>> Not sure why the git diff didn't work, but I did get what I wanted.
>>
>> git show d185278

Ah, people I think this warrants more attention.

Actually I was right in my initial git bisect analysis.
The problem did creep into the code at commit 
d185278c369e9150fe6b4cf730405753384bca93.
The intended change was innocuous enough....but a whole lot of things 
got changed that weren't
supposed to be changed.

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

IMHO, someone's going to need to fix this since the repo got munged.



> And it have nothing to do with H264.
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel



More information about the ffmpeg-devel mailing list