1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavfilter
Michael Niedermayer 1dc1c4e7a8 Merge commit 'a6653787a4b1e89170ff7962312dd110769c83a3'
* commit 'a6653787a4b1e89170ff7962312dd110769c83a3':
  libopencv: Check kernel_str life cycle

Conflicts:
	libavfilter/vf_libopencv.c

See: f16a6f667c993a158643b52815ec42961508b0a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-03 23:35:08 +01:00
..
2015-01-31 12:01:54 +00:00
2014-08-13 01:00:38 +02:00
2015-01-31 12:01:54 +00:00
2015-01-06 10:02:11 +00:00
2015-01-05 01:45:49 +01:00
2015-01-31 12:01:54 +00:00
2014-08-24 14:35:11 +02:00
2014-12-16 10:10:04 +00:00
2015-01-27 01:46:08 +01:00
2015-01-27 01:46:08 +01:00
2014-12-26 15:39:51 -03:00
2015-01-05 01:45:49 +01:00
2015-01-29 04:38:48 +01:00
2015-01-09 17:26:31 +01:00
2014-10-14 17:15:56 +02:00
2015-01-05 01:45:49 +01:00
2015-01-25 15:58:28 +01:00