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)
commitad207f1119d961bb83177765226ee8f3b80e369f
tree10a72fce600d5e3f58e44cbc8eef1c6b71940618
parent127aee4ccb5e36916157e621f8bba5133f94cb75
parent1688eef25385089026aba55da1885f70a57815ab
Merge commit '1688eef25385089026aba55da1885f70a57815ab'

* 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>