]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
projects / frescor / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b1482f 4e8dcd8)
Removed static omkization
authorMichal Sojka <sojkam1@fel.cvut.cz>
Wed, 25 Nov 2009 11:15:08 +0000 (12:15 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Wed, 25 Nov 2009 11:16:34 +0000 (12:16 +0100)
This was done by merging to non-omkized branch using "ours" strategy.


Trivial merge
FFmpeg local copy adapted for FWP Frescor Contracts.