Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 Jul 2015 22:54:42 +0000 (00:54 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 Jul 2015 22:54:42 +0000 (00:54 +0200)
* 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@niedermayer.cc>

No differences found