Merge commit 'f64d1100a54d12c78ce436181bb64229c56da6b3'

Browse Source

* 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
ebce133228
bff7bec1d7
bc4e33ce0f

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

pull/272/head

James Almer 7 years ago

parent 5de85c1029 f64d1100a5

commit b848eb8347

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available