Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Nov 2013 11:17:35 +0000 (12:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Nov 2013 11:17:35 +0000 (12:17 +0100)
commitbe74cb5159ef7f47c400be23c56cdbf6334b6d3e
tree28e8e85da75739ecf45bf0ba8aa95638b204bcf1
parent6a7de2361b94cef914f397314103c67165bdff53
parent7d1a68e95baf232e1c3ee93ee3285f4b309d77ce
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer

Conflicts:
libavfilter/buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/buffer.c