git.sesse.net Git - ffmpeg/commit

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

projects / ffmpeg / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 807d5dc b0f36a0)

author	Clément Bœsch <u@pkh.me>
	Sun, 12 Mar 2017 12:08:04 +0000 (13:08 +0100)
committer	Clément Bœsch <u@pkh.me>
	Sun, 12 Mar 2017 12:08:04 +0000 (13:08 +0100)
commit	993a9a3d72af4f4a07470570bc472a0d385ca78f
tree	761e895d1d4cdb326bfc0b20a089a52847b04f94	tree \| snapshot
parent	807d5dcde9d83dca48f8dfc5c98bbc2be6fdc61c	commit \| diff
parent	b0f36a0043d76436cc7ab8ff92ab99c94595d3c0	commit \| diff

Merge commit 'b0f36a0043d76436cc7ab8ff92ab99c94595d3c0'

* commit 'b0f36a0043d76436cc7ab8ff92ab99c94595d3c0':
avconv: stop using setpts for input framerate forced with -r

Merged-by: Clément Bœsch <u@pkh.me>

configure	diff1 \|	diff2 \|	blob \| history
ffmpeg.c	diff1 \|	\|	blob \| history
ffmpeg.h	diff1 \|	diff2 \|	blob \| history
ffmpeg_filter.c	diff1 \|	\|	blob \| history

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