[FFmpeg-cvslog] Merge commit '8d7839fc7c52574dfc22db0181b1cef9cb929910' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 30 20:58:25 2014 +0200| [fed28fe054de573643ae3fee50ad7ae09d78e738] | committer: Michael Niedermayer

Merge commit '8d7839fc7c52574dfc22db0181b1cef9cb929910' into release/1.1

* commit '8d7839fc7c52574dfc22db0181b1cef9cb929910':
  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=fed28fe054de573643ae3fee50ad7ae09d78e738
---