Merge commit '2e2f8534ebde47d3a3909fe64c2e66204bc56874'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 15:14:11 +0000 (16:14 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 15:14:42 +0000 (16:14 +0100)
commitf5b93c46e93a98bae9e4b1d3adbeaf7f61420862
treed934c448fd9eee167378481f464ad207017b324c
parentbe6b58a98171030687cb0a770589207a5811c92d
parent2e2f8534ebde47d3a3909fe64c2e66204bc56874
Merge commit '2e2f8534ebde47d3a3909fe64c2e66204bc56874'

This commit is a no-op.

* commit '2e2f8534ebde47d3a3909fe64c2e66204bc56874':
  lavc: factor apply_param_change() AV_EF_EXPLODE handling

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>