Merge commit 'f64d1100a54d12c78ce436181bb64229c56da6b3'
authorJames Almer <jamrial@gmail.com>
Thu, 26 Oct 2017 17:11:45 +0000 (14:11 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 26 Oct 2017 17:11:45 +0000 (14:11 -0300)
commitb848eb83479137bbe2c1cc7f8454c20ab7f8fa11
treefbcae084e843b1a883040d662db61a780c0b98f3
parent5de85c1029881970dc69e529dc48e277f3b5336c
parentf64d1100a54d12c78ce436181bb64229c56da6b3
Merge commit 'f64d1100a54d12c78ce436181bb64229c56da6b3'

* commit 'f64d1100a54d12c78ce436181bb64229c56da6b3':
  avconv: Flush output BSFs when encode reaches EOF
  vf_deinterlace_vaapi: Add support for field rate output
  pthread_frame: Propagate sw_pix_fmt across threads

This commit is a noop, see
ebce1332285b16418dacb369defcfd7bae06d319
bff7bec1d7d0ed23f24a2c815f133d58b6b86b1e
bc4e33ce0f0ea797b28d02d02ff29778cbf975a4

Merged-by: James Almer <jamrial@gmail.com>