[FFmpeg-cvslog] Merge commit '86a2602e16171ddc10c3ec655c23b16ffa595059'

Michael Niedermayer git at videolan.org
Wed Jul 3 14:49:19 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  3 14:46:10 2013 +0200| [9dfa5ea5dcc8171e4465fd90df56b5c199dbae49] | committer: Michael Niedermayer

Merge commit '86a2602e16171ddc10c3ec655c23b16ffa595059'

* commit '86a2602e16171ddc10c3ec655c23b16ffa595059':
  jpeg2000: Drop unused and writeonly fields
  jpeg2000: Correctly calculate sgnd

Conflicts:
	libavcodec/jpeg2000.h
	libavcodec/jpeg2000dec.c

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

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





More information about the ffmpeg-cvslog mailing list