Michael Niedermayer e2b703f536 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@gmx.at>

2013-02-12 13:11:14 +01:00

17 KiB

Raw Blame History

View Raw