[FFmpeg-cvslog] Merge commit 'a529f6648ed450f7e846a0e704a0a3260aaa4b62' into release/2.4

Michael Niedermayer git at videolan.org
Sun Mar 29 03:26:05 CEST 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 29 03:16:54 2015 +0200| [6e835eb2dd5204f04822558474c16f41583e0ed5] | committer: Michael Niedermayer

Merge commit 'a529f6648ed450f7e846a0e704a0a3260aaa4b62' into release/2.4

* commit 'a529f6648ed450f7e846a0e704a0a3260aaa4b62':
  hevc: zero the correct variables on invalid crop parameters

Conflicts:
	libavcodec/hevc_ps.c

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

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





More information about the ffmpeg-cvslog mailing list