Merge commit '86d9181cf41edc3382bf2481f95a2fb321058689'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jan 2013 10:48:14 +0000 (11:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jan 2013 10:48:14 +0000 (11:48 +0100)
commit34c1c08c665389daa190cb331e4d899da8dde57a
tree4102f99b0b4cc834d0b9b6ccaef586753ad9c0f0
parent8c3ae9ee66a2fb094b188c994a18df9f3e69a283
parent86d9181cf41edc3382bf2481f95a2fb321058689
Merge commit '86d9181cf41edc3382bf2481f95a2fb321058689'

* commit '86d9181cf41edc3382bf2481f95a2fb321058689':
  rtpdec: Support sending RTCP feedback packets

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpdec.c
libavformat/rtpdec.h
libavformat/rtsp.c
libavformat/rtsp.h
libavformat/version.h