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>

diff --cc libavformat/rtpenc.c
Simple merge

diff --cc libavformat/rtpenc.h
Simple merge

diff --cc libavformat/version.h
index 0bbc90c,2fa9a0f..f6329e4
--- 1/libavformat/version.h
--- 2/libavformat/version.h
+++ b/libavformat/version.h
@@@ -30,8 -30,8 +30,8 @@@
  #include "libavutil/avutil.h"
  
  #define LIBAVFORMAT_VERSION_MAJOR 55
 -#define LIBAVFORMAT_VERSION_MINOR  9
 -#define LIBAVFORMAT_VERSION_MICRO  4
 +#define LIBAVFORMAT_VERSION_MINOR 20
- #define LIBAVFORMAT_VERSION_MICRO 104
++#define LIBAVFORMAT_VERSION_MICRO 105
  
  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                 LIBAVFORMAT_VERSION_MINOR, \