[FFmpeg-cvslog] Merge remote-tracking branch 'shariman/wmall'

Michael Niedermayer git at videolan.org
Wed Dec 7 04:57:34 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec  7 04:49:42 2011 +0100| [1fa8ff38e47b3e0fc63e2a2e8fbbcf9e4fb071c5] | committer: Michael Niedermayer

Merge remote-tracking branch 'shariman/wmall'

* shariman/wmall:
  Fix lms_update()
  Move num_lms reading out of a loop
  Use correct value for range
  Fix some int / int16_t / int32_t confusion
  Implement revert_mclms() and associated functions
  Fix two more int16_t vs. int confusion
  Init s->cdlms[][].recent to order - 1
  Add a size argument to dump_int_buffer()
  Get rid of logging that are not required anymore
  Fix some int vs. int16_t confusion

Conflicts:
	libavcodec/wmalosslessdec.c

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

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





More information about the ffmpeg-cvslog mailing list