[FFmpeg-cvslog] Merge commit '7bc37641e3e6c24d472ae06fcbecaba4c863829b' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 20 14:28:33 2014 +0200| [516ba41f05c8a0e4054d2a858e2951a6091c4811] | committer: Michael Niedermayer

Merge commit '7bc37641e3e6c24d472ae06fcbecaba4c863829b' into release/2.2

* commit '7bc37641e3e6c24d472ae06fcbecaba4c863829b':
  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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=516ba41f05c8a0e4054d2a858e2951a6091c4811
---