OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e066fb5 556aab8)
Merge commit '556aab8f11b045a21182eee32413aa78d5c8539b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Mar 2013 14:50:43 +0000 (15:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Mar 2013 14:50:43 +0000 (15:50 +0100)
* commit '556aab8f11b045a21182eee32413aa78d5c8539b':
  lavfi: use designated initializers in avfilter_class

Conflicts:
libavfilter/avfilter.c

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

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