Merge commit 'b0f36a0043d76436cc7ab8ff92ab99c94595d3c0'
authorClément Bœsch <u@pkh.me>
Sun, 12 Mar 2017 12:08:04 +0000 (13:08 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 12 Mar 2017 12:08:04 +0000 (13:08 +0100)
commit993a9a3d72af4f4a07470570bc472a0d385ca78f
tree761e895d1d4cdb326bfc0b20a089a52847b04f94
parent807d5dcde9d83dca48f8dfc5c98bbc2be6fdc61c
parentb0f36a0043d76436cc7ab8ff92ab99c94595d3c0
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
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c