diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 20:51:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 20:51:52 +0200 |
| commit | cec7afd03640f7296af1f1f3a3b20845ce37ee39 (patch) | |
| tree | 5f46233682b3a17f6adb5b0a04a75e9ec6c769b5 /libavdevice | |
| parent | fc6aa304596bba3837e1026fe1fb6abba1295ab5 (diff) | |
| parent | 09e1ccc8cddc946da5e10841f10dc5ebdd187d9d (diff) | |
Merge commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d'
* commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d':
sctp: Use AVERROR_BUG instead of abort()
Conflicts:
libavformat/sctp.c
See: 2e59142fa9a0db5fab8aa2e676ba524f61280b83
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
0 files changed, 0 insertions, 0 deletions