* commit '5d3addb9':
  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@niedermayer.cc>