Commit e2b703f5 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '62a43d30'

* commit '62a43d30':
  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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 3ccda2b0 62a43d30
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment