[FFmpeg-cvslog] Merge commit 'eef38316cab68aff080cf2b83c2427a734194e8d'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Nov 29 16:05:50 2015 +0100| [c754591677367ee9a95ce138daa68d36df0b6ce4] | committer: Hendrik Leppkes

Merge commit 'eef38316cab68aff080cf2b83c2427a734194e8d'

* commit 'eef38316cab68aff080cf2b83c2427a734194e8d':
  texturedspenc: Avoid using separate variables

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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