Merge commit '462a54e2291e1fa18e1f1254d09739dfbb795617'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 14:26:51 +0000 (15:26 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 14:26:51 +0000 (15:26 +0100)
commit93fb4a46298c5dc456154b0eb594b8a704e366cd
tree855235c037579d68bc4ed8c3764872ea1e9b53ec
parentda7cfef7f0c98c05571c62d344aad83e0e85d0fb
parent462a54e2291e1fa18e1f1254d09739dfbb795617
Merge commit '462a54e2291e1fa18e1f1254d09739dfbb795617'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/mpegvideo_enc.c
libavcodec/version.h