Merge commit '33d412eb4a2a083c1514ddbe69295b37e1918a8c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Mar 2015 20:52:57 +0000 (21:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Mar 2015 20:53:14 +0000 (21:53 +0100)
* commit '33d412eb4a2a083c1514ddbe69295b37e1918a8c':
  dashenc: Simplify code by using a local variable

Conflicts:
libavformat/dashenc.c

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

Trivial merge