[FFmpeg-cvslog] Merge commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a'

Michael Niedermayer git at videolan.org
Thu Nov 13 15:26:21 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 13 15:20:40 2014 +0100| [7a79c055e378d1a079d439c3e99fa45289d4a68e] | committer: Michael Niedermayer

Merge commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a'

* commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a':
  jpeg2000: do not compute the same value twice

Conflicts:
	libavcodec/jpeg2000.c

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

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





More information about the ffmpeg-cvslog mailing list