[FFmpeg-cvslog] Merge commit '61d8fa2a1ab76f0f3ac1442faa104ace4b29decc'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Mon Aug 24 10:36:27 2015 +0200| [0f72dfeb5f2499a25ec7e4205e44d0ee64190434] | committer: Hendrik Leppkes

Merge commit '61d8fa2a1ab76f0f3ac1442faa104ace4b29decc'

* commit '61d8fa2a1ab76f0f3ac1442faa104ace4b29decc':
  h264: Fix faulty call to avpriv_request_sample

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

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