[FFmpeg-cvslog] Merge commit '2a48a75a6f508121b96b0732a9fe03a46303f579'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Wed Jun 29 11:09:36 2016 +0200| [1994a73a6ba424c03080f02e6b98ef96b7079c47] | committer: Clément Bœsch

Merge commit '2a48a75a6f508121b96b0732a9fe03a46303f579'

* commit '2a48a75a6f508121b96b0732a9fe03a46303f579':
  sgirledec: simplify, no need to use reget buffer

This commit is a noop, see ccc3f4e7104eda0f72436720ebcdc2e916217c7a

Merged-by: Clément Bœsch <clement at stupeflix.com>

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