[FFmpeg-cvslog] Merge commit 'f64d1100a54d12c78ce436181bb64229c56da6b3'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Oct 26 14:11:45 2017 -0300| [b848eb83479137bbe2c1cc7f8454c20ab7f8fa11] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b848eb83479137bbe2c1cc7f8454c20ab7f8fa11
---