[FFmpeg-cvslog] Merge commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50'

Michael Niedermayer git at videolan.org
Mon May 6 21:38:14 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May  6 21:15:47 2013 +0200| [050b48f39783d7af05fc805fc4278a97941e7436] | committer: Michael Niedermayer

Merge commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50'

* commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50':
  swscale: Remove unnecessary backslashes
  jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck

Conflicts:
	libavcodec/jpeg2000dec.c

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

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





More information about the ffmpeg-cvslog mailing list