]> git.sesse.net Git - ffmpeg/commit
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Sep 2013 09:02:01 +0000 (11:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Sep 2013 09:02:01 +0000 (11:02 +0200)
commit7381d31f2267489ed5e939707b7e77a20adc168d
tree0e5811bf6eadc8742a1ee88634e9533d29eed927
parent945c7e399af230d9fde6df641f13a11dfc5d4954
parent0767bfd1994c4bf22e167ffadb8f823a950aad18
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi: allow user-provided execute() callbacks

Conflicts:
libavfilter/avfilter.h
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavfilter/pthread.c
libavfilter/thread.h
libavfilter/version.h