FFmpeg/libavcodec
Michael Niedermayer 9c943e077b Merge commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031'
* commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031':
  qsvenc: properly handle asynchronous encoding

Conflicts:
	libavcodec/qsvenc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 16:34:12 +02:00
..
2015-07-07 22:56:30 +02:00
2015-06-14 15:09:33 +02:00
2015-06-24 14:45:16 +01: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-07-17 22:14:00 +02: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-07-17 00:16:45 +02:00