[FFmpeg-cvslog] Merge commit '232399e3ee219d16d0e0d482c9f31a26202d4993'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Nov 13 17:25:23 2016 +0100| [4945343606ec3a2d94c0ac5891c685997f6b43e9] | committer: Hendrik Leppkes

Merge commit '232399e3ee219d16d0e0d482c9f31a26202d4993'

* commit '232399e3ee219d16d0e0d482c9f31a26202d4993':
  avconv: pass the hwaccel frames context to the decoder

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

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