git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

projects / ffmpeg / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 80fa5a0 8e07c22)

author	Mark Thompson <sw@jkqxz.net>
	Sun, 12 Mar 2017 15:21:41 +0000 (15:21 +0000)
committer	Mark Thompson <sw@jkqxz.net>
	Sun, 12 Mar 2017 15:21:41 +0000 (15:21 +0000)
commit	a7434ef19585f3af9ec168ec2db3db299f447285
tree	08fb000fa6c323c34839d1e014414238c912f9e8	tree \| snapshot
parent	80fa5a0bcc13375711d9901f6ac7d8bdcc10a883	commit \| diff
parent	8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4	commit \| diff

Merge commit '8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4'

* commit '8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4':
qsvenc: print warnings from encode/init

Merged-by: Mark Thompson <sw@jkqxz.net>

libavcodec/qsv.c	diff1 \|	diff2 \|	blob \| history
libavcodec/qsv_internal.h	diff1 \|	diff2 \|	blob \| history
libavcodec/qsvenc.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.