Merge commit '71d6551e674c86d07c165439c2bf6613b3892307'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Jun 2014 10:57:56 +0000 (12:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Jun 2014 10:58:16 +0000 (12:58 +0200)
commitfa0d0fb42ecda5d9676c744195fd9ef0454c259d
treef446e564af0f956f23fa39cbbfad722a533ac50b
parent61df0819d49ba831948681a7e8aa1a6def26b1a9
parent71d6551e674c86d07c165439c2bf6613b3892307
Merge commit '71d6551e674c86d07c165439c2bf6613b3892307'

* commit '71d6551e674c86d07c165439c2bf6613b3892307':
  avconv: use the correct variable in comparison

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