[FFmpeg-cvslog] Merge commit '6cf7f30655e95e27fd0394b5a80970d6f9517015'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  6 11:56:18 2015 +0100| [c3f64a2233805ec238b57179b6a2477402ccfe04] | committer: Michael Niedermayer

Merge commit '6cf7f30655e95e27fd0394b5a80970d6f9517015'

* commit '6cf7f30655e95e27fd0394b5a80970d6f9517015':
  dashenc: Simplify code by using a local variable

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c3f64a2233805ec238b57179b6a2477402ccfe04
---