OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce58642 42b5688)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Dec 2012 09:50:14 +0000 (10:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Dec 2012 09:50:21 +0000 (10:50 +0100)
* qatar/master:
  lavr: fix segfault due to overlooked change needed in 14758e3
  x86inc: support stack mem allocation and re-alignment in PROLOGUE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavresample/utils.c patch | diff1 | diff2 | blob | history

diff --cc libavresample/utils.c
Simple merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help