Merge commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 15:31:45 +0000 (17:31 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 15:31:45 +0000 (17:31 +0200)
commitb9fd813351733b867fb73219e33b1f4845b40dde
tree5eabf60865b557c7616892fa6ce7c2676f97cb54
parentf1b02e6ca88909f428d4a690c47620575853b647
parent8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79
Merge commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79'

* commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79':
  lavu: Drop deprecated duplicated AVFrame/AVCodecContext parameters

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/avcodec.h
libavcodec/utils.c
libavutil/frame.c
libavutil/frame.h
libavutil/version.h