Merge commit '62a43d30cc3b9b2460f2c926beb522df32493625'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Feb 2013 11:58:10 +0000 (12:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Feb 2013 12:11:14 +0000 (13:11 +0100)
* 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>
1  2 
libavutil/crc.c

diff --cc libavutil/crc.c
Simple merge