[FFmpeg-cvslog] Merge commit '63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Jan 19 08:41:32 2016 +0100| [7dae3461c0bbd15e0765f29c33d2eb40566b9562] | committer: Hendrik Leppkes

Merge commit '63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2'

* commit '63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2':
  avconv: Drop an impossible check

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

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