1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavformat
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-05-23 22:36:02 +02:00
2015-04-07 22:50:07 +02:00
2015-07-12 12:17:40 +02:00
2015-03-06 21:35:00 +01:00
2015-02-26 02:06:10 +01:00
2015-03-26 03:10:27 +01:00
2015-06-14 15:09:33 +02:00
2015-05-26 19:54:41 +02:00
2015-07-12 20:23:58 +02:00
2015-05-31 19:04:52 +02:00
2015-05-31 10:10:16 +03:00
2015-06-07 21:55:46 +02:00
2015-05-27 21:48:47 +02:00
2015-04-23 12:56:31 +02:00
2015-07-08 12:06:17 +02:00
2015-06-22 10:47:29 +03:00
2015-04-24 03:43:56 +02:00