1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavfilter
Michael Niedermayer 0652ffc69a Merge remote-tracking branch 'qatar/master'
* qatar/master:
  vf_settb: rename to settb

Conflicts:
	libavfilter/Makefile
	libavfilter/f_settb.c
	libavfilter/settb.c
	libavfilter/vf_settb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02 18:25:15 +02:00
..
2014-02-26 16:37:59 +00:00
2014-02-26 16:37:59 +00:00
2014-01-19 17:12:40 +01:00
2014-02-26 16:37:59 +00:00
2014-01-19 17:12:50 +01:00
2013-09-30 08:47:40 +00:00
2013-09-12 14:01:43 +00:00
2013-11-10 19:16:45 +01:00
2013-12-03 04:09:10 +01:00
2014-02-07 09:33:56 +01:00
2014-03-31 03:22:20 +02:00
2013-06-14 01:27:22 +02:00
2014-01-19 17:13:02 +01:00