[FFmpeg-cvslog] Merge commit '69f6f03cd16a09e4e848b4e82bae4993bc361cd0'

Michael Niedermayer git at videolan.org
Wed Apr 17 16:10:01 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 17 16:04:38 2013 +0200| [8cff853b23362b0cb88e6d424e3362a437c1a6b7] | committer: Michael Niedermayer

Merge commit '69f6f03cd16a09e4e848b4e82bae4993bc361cd0'

* commit '69f6f03cd16a09e4e848b4e82bae4993bc361cd0':
  rv10: cosmetics, reformat
  qdm2: check that the FFT size is a power of 2

Conflicts:
	libavcodec/rv10.c

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

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





More information about the ffmpeg-cvslog mailing list