[FFmpeg-cvslog] Merge commit 'd1916d13e28b87f4b1b214231149e12e1d536b4b'

Michael Niedermayer git at videolan.org
Thu Nov 28 22:46:07 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 28 22:00:25 2013 +0100| [f21ca39e8156c7957348bf37e9dc9d311488ae14] | committer: Michael Niedermayer

Merge commit 'd1916d13e28b87f4b1b214231149e12e1d536b4b'

* commit 'd1916d13e28b87f4b1b214231149e12e1d536b4b':
  dsputil/pngdsp: fix signed/unsigned type in end comparison

Conflicts:
	libavcodec/dsputil.c

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

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





More information about the ffmpeg-cvslog mailing list