ffmpeg | branch: master | Michael Niedermayer <michae...@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 <michae...@gmx.at>

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



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to