diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 12:47:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 12:47:10 +0100 |
| commit | 252f56636ca0fc1d5223d091b1d56f6a5ab2b8af (patch) | |
| tree | 499c8f42e24bedcadf8e88ab5af5f53a40d20293 /libavdevice | |
| parent | 84f972f9944ad29712c70f22bd55b2b12171abf8 (diff) | |
| parent | 97de206b44a48da726807cc3e7b9448a8112760b (diff) | |
| download | ffmpeg-252f56636ca0fc1d5223d091b1d56f6a5ab2b8af.tar.gz | |
Merge commit '97de206b44a48da726807cc3e7b9448a8112760b'
* commit '97de206b44a48da726807cc3e7b9448a8112760b':
lavc: disable CRC checking by default
Conflicts:
libavcodec/options_table.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
0 files changed, 0 insertions, 0 deletions