Merge commit '3e175a2a550f5c2f788e8cd969052e10a5025a27'

* commit '3e175a2a550f5c2f788e8cd969052e10a5025a27':
  avconv: mark attachment streams as immediately finished
  vaapi: fix argument for ff_vaapi_common_end_frame call

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc ffmpeg_opt.c
index 39fb3b4,2c43da2..e6fab2a
--- 1/ffmpeg_opt.c
--- 2/avconv_opt.c
+++ b/ffmpeg_opt.c
@@@ -1310,10 -1092,11 +1310,11 @@@ static OutputStream *new_data_stream(Op
      return ost;
  }
  
 -static OutputStream *new_attachment_stream(OptionsContext *o, AVFormatContext *oc)
 +static OutputStream *new_attachment_stream(OptionsContext *o, AVFormatContext *oc, int source_index)
  {
 -    OutputStream *ost = new_output_stream(o, oc, AVMEDIA_TYPE_ATTACHMENT);
 +    OutputStream *ost = new_output_stream(o, oc, AVMEDIA_TYPE_ATTACHMENT, source_index);
      ost->stream_copy = 1;
+     ost->finished    = 1;
      return ost;
  }
  

diff --cc libavcodec/vaapi.c
Simple merge