[FFmpeg-cvslog] Merge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May  5 15:09:46 2014 +0200| [22ffa5390f6b4bb99fc6cd1fb0f629f6c3a9ba8d] | committer: Michael Niedermayer

Merge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11'

* commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11':
  avconv: remove a useless line

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

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