OSDN Git Service

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)
commit18369967a56dc807804c3f2ff0fc97457356be34
tree10b36b6c0476ced3104b0e2d6911a77dceb4b648
parente066fb54cb6fbc52cd95640ec0e81222750bb329
parent556aab8f11b045a21182eee32413aa78d5c8539b
Merge commit '556aab8f11b045a21182eee32413aa78d5c8539b'

* commit '556aab8f11b045a21182eee32413aa78d5c8539b':
  lavfi: use designated initializers in avfilter_class

Conflicts:
libavfilter/avfilter.c

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