ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Feb 3
23:34:10 2015 +0100| [1dc1c4e7a82edb13420f064890fbde3751ca18c9] | committer:
Michael Niedermayer
Merge commit 'a6653787a4b1e89170ff7962312dd110769c83a3'
* commit 'a6653787a4b1e89170ff7962312dd110769c83a3':
libopencv: Check kernel_str life cycle
Conflicts:
libavfilter/vf_libopencv.c
See: f16a6f667c993a158643b52815ec42961508b0a9
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1dc1c4e7a82edb13420f064890fbde3751ca18c9
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
