[FFmpeg-cvslog] Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Jul 21 00:54:42 2015 +0200| [e5bae39f46e55843c025d280ed5441e358e59f2e] | committer: Michael Niedermayer

Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'

* commit '5d3addb937946eca5391e40b5e6308e74ac6f77b':
  Add a quality factor packet side data

Conflicts:
	doc/APIchanges
	ffmpeg.c
	libavcodec/avcodec.h
	libavcodec/mpegvideo_enc.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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