[FFmpeg-cvslog] Merge commit '62a43d30cc3b9b2460f2c926beb522df32493625'

Michael Niedermayer git at videolan.org
Tue Feb 12 13:11:36 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 12 12:58:10 2013 +0100| [e2b703f53612680f4be6721e51100bd552d55dd8] | committer: Michael Niedermayer

Merge commit '62a43d30cc3b9b2460f2c926beb522df32493625'

* commit '62a43d30cc3b9b2460f2c926beb522df32493625':
  crc: Move static data table from header to .c file
  avcodec/rectangle: Remove nonsense assert

Conflicts:
	libavcodec/rectangle.h
	libavutil/crc_data.h

The assert is not removed as the assert ensures clear and easy
to debug failures instead of undefined behavior in case of
misalignment.

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

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





More information about the ffmpeg-cvslog mailing list