Merge commit '63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 19 Jan 2016 07:41:32 +0000 (08:41 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 19 Jan 2016 07:41:32 +0000 (08:41 +0100)
commit7dae3461c0bbd15e0765f29c33d2eb40566b9562
treef559ab77f7404a725a0ba84a85613ae29483e36a
parent4440c8e9c98f138a04dafdec8f3d21ce8f07f7b9
parent63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2
Merge commit '63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
ffmpeg.c