Merge commit '4d56f7ab8f627aa140c1ede1bb61305f01cefcdd'
authorJames Almer <jamrial@gmail.com>
Tue, 31 Oct 2017 02:07:15 +0000 (23:07 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 31 Oct 2017 02:07:15 +0000 (23:07 -0300)
commita7da13474286774cf378c3ea606c19a7c1a0eba3
tree72dfe851f855241e2b34e400cfc29b2aa1c242f2
parentf7038c3629e7c9db3d75c11db4c67d94352d9f70
parent4d56f7ab8f627aa140c1ede1bb61305f01cefcdd
Merge commit '4d56f7ab8f627aa140c1ede1bb61305f01cefcdd'

* commit '4d56f7ab8f627aa140c1ede1bb61305f01cefcdd':
  avconv: Flush output BSFs when stream copy reaches EOF

Merged-by: James Almer <jamrial@gmail.com>
fftools/ffmpeg.c