1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Michael Niedermayer 7381d31f22 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>
2013-09-28 11:02:01 +02:00
..
2013-09-19 10:07:53 +02:00
2013-01-06 16:30:02 +01:00
2012-12-21 00:18:34 +01:00
2013-07-22 03:37:55 +02:00
2013-08-29 22:52:04 +02:00
2013-02-14 23:45:48 +01:00
2012-12-21 00:18:34 +01:00