[FFmpeg-cvslog] Merge commit '22b985d59c007c4422aefe3ef3fca0aa0daafa9f'

Michael Niedermayer git at videolan.org
Thu Jan 29 23:03:09 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 29 22:43:36 2015 +0100| [ccccfb59b14ffbc2a6c1d402c8cae3cdf30f1a6e] | committer: Michael Niedermayer

Merge commit '22b985d59c007c4422aefe3ef3fca0aa0daafa9f'

* commit '22b985d59c007c4422aefe3ef3fca0aa0daafa9f':
  hqdn3d: check memory allocations and propagate errors

Conflicts:
	libavfilter/vf_hqdn3d.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ccccfb59b14ffbc2a6c1d402c8cae3cdf30f1a6e
---





More information about the ffmpeg-cvslog mailing list