Merge commit 'cea7fd9afb8488a6c48f7d7ee38602e1fd3dd425'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 19:51:20 +0000 (16:51 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 19:51:20 +0000 (16:51 -0300)
commit1242a6170e93351b519a0b92861654d5ff14d8dc
tree58f7728a563bdab27f10a0fd9da1a2be12fd2710
parent8b63acaeee246a9f8c72a2dc4c2074016ed91ffb
parentcea7fd9afb8488a6c48f7d7ee38602e1fd3dd425
Merge commit 'cea7fd9afb8488a6c48f7d7ee38602e1fd3dd425'

* commit 'cea7fd9afb8488a6c48f7d7ee38602e1fd3dd425':
  mlp: Drop ff_ prefix from a static function

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/mlp_parser.c