* commit '3e175a2a':
  avconv: mark attachment streams as immediately finished
  vaapi: fix argument for ff_vaapi_common_end_frame call
Merged-by: Michael Niedermayer <michaelni@gmx.at>