Merge commit '5655732c77f2df9c1dfbddc30cd4844390a6921f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Jan 2014 02:36:42 +0000 (03:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Jan 2014 02:37:03 +0000 (03:37 +0100)
* commit '5655732c77f2df9c1dfbddc30cd4844390a6921f':
  avfilter: add needs_writable field to the internal AVFilterPad structure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/internal.h

Simple merge