[FFmpeg-cvslog] Merge commit '462a54e2291e1fa18e1f1254d09739dfbb795617'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Nov 29 15:26:51 2015 +0100| [93fb4a46298c5dc456154b0eb594b8a704e366cd] | committer: Hendrik Leppkes

Merge commit '462a54e2291e1fa18e1f1254d09739dfbb795617'

* commit '462a54e2291e1fa18e1f1254d09739dfbb795617':
  lavc: Deprecate avctx.rtp_callback field

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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