diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-15 20:05:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-15 20:05:18 +0100 |
| commit | 221dc52d03e113bd394ea3c6746d4b5506bd7dd1 (patch) | |
| tree | b4d28503876e0c099dd4d7c8c0523bdca2bab9ef /libavcodec/xan.c | |
| parent | fd334b9b6e89068c59be2e0a910800c6527812b0 (diff) | |
| parent | dc4d726bab59f349d366916ba01df16289e5c81f (diff) | |
| download | ffmpeg-221dc52d03e113bd394ea3c6746d4b5506bd7dd1.tar.gz | |
Merge commit 'dc4d726bab59f349d366916ba01df16289e5c81f'
* commit 'dc4d726bab59f349d366916ba01df16289e5c81f':
build: Add separate hidden config option for the intrax8 code
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xan.c')
0 files changed, 0 insertions, 0 deletions