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)
commit0f72dfeb5f2499a25ec7e4205e44d0ee64190434
tree0b8d7899361de7e4e6e82d4a7b9c1bf7dae37d5c
parenta4c13f95fbe2e1c2a3e55bffcd55d5a679f45253
parent61d8fa2a1ab76f0f3ac1442faa104ace4b29decc
Merge commit '61d8fa2a1ab76f0f3ac1442faa104ace4b29decc'

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

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