[FFmpeg-cvslog] Merge commit '86d9181cf41edc3382bf2481f95a2fb321058689'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan  9 11:48:14 2013 +0100| [34c1c08c665389daa190cb331e4d899da8dde57a] | committer: Michael Niedermayer

Merge commit '86d9181cf41edc3382bf2481f95a2fb321058689'

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

Conflicts:
	libavformat/version.h

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

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