Merge commit '4b68edd08ac352e314ae3fc701f90b081e549324'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Nov 2014 00:15:26 +0000 (01:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Nov 2014 00:16:32 +0000 (01:16 +0100)
commitd899ea2017ef555f93939db3bac259f4c1df0672
treebc2b8f64da5b7b4bc364b5a5b74418aca3f97c3e
parent293fee4bc2350049a5b42fb866d6c944b79a1dfa
parent4b68edd08ac352e314ae3fc701f90b081e549324
Merge commit '4b68edd08ac352e314ae3fc701f90b081e549324'

* commit '4b68edd08ac352e314ae3fc701f90b081e549324':
  flvenc: Remove an unused variable

See: cc5f7315413251b25cf765a2ada4edea94c0309b
Merged-by: Michael Niedermayer <michaelni@gmx.at>