OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6bcdf0 7a9b764)
Merge commit '7a9b764c0737f42cf2458c3c5378b0df216e14a2'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 11 Apr 2015 15:47:19 +0000 (17:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 11 Apr 2015 15:59:21 +0000 (17:59 +0200)
* commit '7a9b764c0737f42cf2458c3c5378b0df216e14a2':
  libdc1394: Unbreak build after c201069fa

See: fe25194c5870f21ba10f615f036b64d0c84fca48
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help