[FFmpeg-cvslog] Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 24 21:08:19 2014 +0100| [70a25587d22384bca8f102d68f5b65ebf3e421b2] | committer: Michael Niedermayer

Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'

* commit '67f2a688143b644f99360565a9f36c61a5f052e9':
  avconv: remove a write-only variable

Conflicts:
	ffmpeg.c
	ffmpeg.h

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

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