Commit b848eb83 authored by James Almer's avatar James Almer

Merge commit 'f64d1100'

* commit 'f64d1100':
  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
ebce1332
bff7bec1
bc4e33ceMerged-by: 's avatarJames Almer <jamrial@gmail.com>
parents 5de85c10 f64d1100
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment