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)
commite5bae39f46e55843c025d280ed5441e358e59f2e
treee2de68b736efbb95d8e83a99fdfccf7a948b62f4
parentb1fad7ac200d0779a44fc267085d7d46ce2391b9
parent5d3addb937946eca5391e40b5e6308e74ac6f77b
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@niedermayer.cc>
12 files changed:
doc/APIchanges
ffmpeg.c
ffmpeg.h
libavcodec/avcodec.h
libavcodec/dnxhdenc.c
libavcodec/libx264.c
libavcodec/libxavs.c
libavcodec/libxvid.c
libavcodec/mpegvideo_enc.c
libavcodec/svq1enc.c
libavcodec/version.h
libavformat/dump.c