FFmpeg/libavcodec
Michael Niedermayer e5bae39f46 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>
2015-07-21 00:54:42 +02:00
..
2015-07-07 22:56:30 +02:00
2015-06-04 23:10:56 +02:00
2015-06-14 15:09:33 +02:00
2015-07-20 00:03:11 +02:00
2015-06-06 16:02:19 +00:00
2015-06-19 13:57:36 +02:00
2015-06-28 14:51:07 +02:00
2015-07-17 00:16:45 +02:00
2015-06-24 15:09:31 -07:00
2015-06-17 20:11:43 +02:00
2015-07-01 20:30:48 +02:00
2015-06-26 23:35:26 +02:00
2015-07-10 16:21:50 +02:00
2015-05-31 15:03:31 +02:00