ffmpeg | branch: release/2.4 | Michael Niedermayer <[email protected]> | Sun Mar 
29 03:26:42 2015 +0200| [8e7eb268758dcb37a4452d02e8908ebf709e21e2] | committer: 
Michael Niedermayer

Merge commit '9cef65434e5e5ffbd4a856ce7ae9c067dec039b7' into release/2.4

* commit '9cef65434e5e5ffbd4a856ce7ae9c067dec039b7':
  h264_ps: properly check cropping parameters against overflow

Conflicts:
        libavcodec/h264_ps.c

See: c3bd306e78f9e3ca2f136f5b30cbe49fa0884f82
Merged-by: Michael Niedermayer <[email protected]>

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



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to