Merge commit 'c829b35c08ad8e1df45cca1cd12f084cf1183d07'
* commit 'c829b35c08ad8e1df45cca1cd12f084cf1183d07': lavc: er: remove unused variable size No change as the variable is used Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in: