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)
* commit 'fcae9f212a6001d966c52dc22cd4b22e9851b428':
  dashenc: Avoid a VLA-like construct

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

Simple merge