Merge commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 18:34:19 +0000 (19:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 18:34:19 +0000 (19:34 +0100)
commit04894ef32e325e33d420e15c16e3714e0f95fdb0
tree2dc3965064061cfbe8f0551cb1f1f5a4b802a768
parent5a7a56d7bef3304a85b49133e42b6a73ab4de181
parent9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05
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>
libavformat/rtpenc.c
libavformat/rtpenc.h
libavformat/version.h