OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02a6ee5 6a5bfd4)
Merge commit '6a5bfd4d49e7433f6de869ccfe682940dbca8740'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 09:21:50 +0000 (11:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 09:22:23 +0000 (11:22 +0200)
* commit '6a5bfd4d49e7433f6de869ccfe682940dbca8740':
  atrac: Add missing av_cold

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

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