[FFmpeg-cvslog] Merge commit '6cc1409ba8650fb7eaedc96e970664febc02a5e9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 11 20:35:26 2014 +0200| [15e933b77365b20e3365b1de5b806493494a709f] | committer: Michael Niedermayer

Merge commit '6cc1409ba8650fb7eaedc96e970664febc02a5e9'

* commit '6cc1409ba8650fb7eaedc96e970664febc02a5e9':
  examples/output: Remove unused variable

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

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