Merge commit '61d8fa2a1ab76f0f3ac1442faa104ace4b29decc'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 24 Aug 2015 08:36:27 +0000 (10:36 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 24 Aug 2015 08:36:27 +0000 (10:36 +0200)
* commit '61d8fa2a1ab76f0f3ac1442faa104ace4b29decc':
  h264: Fix faulty call to avpriv_request_sample

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

Trivial merge