Merge commit '1688eef25385089026aba55da1885f70a57815ab'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Aug 2014 10:38:53 +0000 (12:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Aug 2014 10:38:53 +0000 (12:38 +0200)
* commit '1688eef25385089026aba55da1885f70a57815ab':
  avconv: fix the muxrate values for -target

Conflicts:
ffmpeg_opt.c

No change, as ffmpegs muxrate is in bits/sec

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

Trivial merge