[FFmpeg-cvslog] Merge commit 'd8a45d2d49f54fde042b195f9d5859251252493d'

Michael Niedermayer git at videolan.org
Sat Mar 21 12:20:17 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 12:08:14 2015 +0100| [665e0c10a63d31dd6c7b1fba14db074625d54614] | committer: Michael Niedermayer

Merge commit 'd8a45d2d49f54fde042b195f9d5859251252493d'

* commit 'd8a45d2d49f54fde042b195f9d5859251252493d':
  h264_ps: properly check cropping parameters against overflow

Conflicts:
	libavcodec/h264_ps.c

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

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





More information about the ffmpeg-cvslog mailing list