diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 00:45:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 00:45:58 +0200 |
| commit | 7695a538ed24e3cef52f74a4eee731d137a97f4e (patch) | |
| tree | 9bcbbaf2df0dde5610c5f7a93cc8ac247a42a7bc /libavutil/rc4.c | |
| parent | 9d91fae8a1091393ad96585324acc2328d8138f2 (diff) | |
| parent | fbf4d2197f35bddccec00ad53185ee4ab81778a0 (diff) | |
| download | ffmpeg-7695a538ed24e3cef52f74a4eee731d137a97f4e.tar.gz | |
Merge commit 'fbf4d2197f35bddccec00ad53185ee4ab81778a0'
* commit 'fbf4d2197f35bddccec00ad53185ee4ab81778a0':
build: Record explicit dependency of intrax8 on error resilience
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/rc4.c')
0 files changed, 0 insertions, 0 deletions