Michael Niedermayer cec7afd036 Merge commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d' ...

* commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d':
  sctp: Use AVERROR_BUG instead of abort()

Conflicts:
	libavformat/sctp.c

See: 2e59142fa9
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-10-10 20:51:52 +02:00

9.5 KiB

Raw Blame History

View Raw