Merge commit 'fcae9f212a6001d966c52dc22cd4b22e9851b428'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 11:52:09 +0000 (12:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 11:52:13 +0000 (12:52 +0100)
commitf001a2bd344e01097fbc546375620ed11ee4c376
tree325a4a94e75ad6605d245474a79fb95c53a6f91d
parent5ce070c16c728022b43c7e6d68e3068e2b446e33
parentfcae9f212a6001d966c52dc22cd4b22e9851b428
Merge commit 'fcae9f212a6001d966c52dc22cd4b22e9851b428'

* commit 'fcae9f212a6001d966c52dc22cd4b22e9851b428':
  dashenc: Avoid a VLA-like construct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/dashenc.c