Michael Niedermayer 04894ef32e Merge commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05' ...

* commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05':
  rtpenc: Add a rtpflag option for sending BYE packets when finishing

Conflicts:
	libavformat/version.h

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

2013-11-01 19:34:19 +01:00

4.0 KiB

Raw Blame History

View Raw