Merge commit '97cd7a3dc005a0ad1656dbb2af92e9c5d0731f21'
authorClément Bœsch <u@pkh.me>
Mon, 3 Apr 2017 18:45:35 +0000 (20:45 +0200)
committerClément Bœsch <u@pkh.me>
Mon, 3 Apr 2017 18:45:35 +0000 (20:45 +0200)
commitde9c93bf5393090cc267d3fb9584512714e48606
tree56c5cae6ef481353638d95b20f156e3004b1b5b6
parent98c66e2fe46dc7bdc8e85feefb09fa1b0713d8c4
parent97cd7a3dc005a0ad1656dbb2af92e9c5d0731f21
Merge commit '97cd7a3dc005a0ad1656dbb2af92e9c5d0731f21'

* commit '97cd7a3dc005a0ad1656dbb2af92e9c5d0731f21':
  rtpdec_mpeg4: const correctness for parse_fmtp_config()

This commit is a noop, see ed491db3e506c0e1ee6b9281ce898c4a79298e0f

Merged-by: Clément Bœsch <u@pkh.me>