[FFmpeg-cvslog] Merge commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Sep  5 17:31:45 2015 +0200| [b9fd813351733b867fb73219e33b1f4845b40dde] | committer: Hendrik Leppkes

Merge commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79'

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

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

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