[FFmpeg-cvslog] Merge commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d'

Michael Niedermayer git at videolan.org
Fri Oct 10 21:02:59 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 10 20:51:52 2014 +0200| [cec7afd03640f7296af1f1f3a3b20845ce37ee39] | committer: Michael Niedermayer

Merge commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d'

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

Conflicts:
	libavformat/sctp.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cec7afd03640f7296af1f1f3a3b20845ce37ee39
---





More information about the ffmpeg-cvslog mailing list