diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-12 12:58:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-12 13:11:14 +0100 |
| commit | e2b703f53612680f4be6721e51100bd552d55dd8 (patch) | |
| tree | 19c1bae8a9cabde6a104f5b95f10efd638fdfb27 /libavutil/arm/timer.h | |
| parent | 3ccda2b02ba643df35bf76988cfecba0c5034bb1 (diff) | |
| parent | 62a43d30cc3b9b2460f2c926beb522df32493625 (diff) | |
| download | ffmpeg-e2b703f53612680f4be6721e51100bd552d55dd8.tar.gz | |
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>
Diffstat (limited to 'libavutil/arm/timer.h')
0 files changed, 0 insertions, 0 deletions