Merge commit '1688eef2'

* commit '1688eef2':
  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>