Commit 9df00574 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '3e175a2a'

* commit '3e175a2a':
  avconv: mark attachment streams as immediately finished
  vaapi: fix argument for ff_vaapi_common_end_frame call
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 8a523cfa 3e175a2a
...@@ -1314,6 +1314,7 @@ static OutputStream *new_attachment_stream(OptionsContext *o, AVFormatContext *o ...@@ -1314,6 +1314,7 @@ static OutputStream *new_attachment_stream(OptionsContext *o, AVFormatContext *o
{ {
OutputStream *ost = new_output_stream(o, oc, AVMEDIA_TYPE_ATTACHMENT, source_index); OutputStream *ost = new_output_stream(o, oc, AVMEDIA_TYPE_ATTACHMENT, source_index);
ost->stream_copy = 1; ost->stream_copy = 1;
ost->finished = 1;
return ost; return ost;
} }
......
...@@ -212,7 +212,7 @@ int ff_vaapi_mpeg_end_frame(AVCodecContext *avctx) ...@@ -212,7 +212,7 @@ int ff_vaapi_mpeg_end_frame(AVCodecContext *avctx)
ff_mpeg_draw_horiz_band(s, 0, s->avctx->height); ff_mpeg_draw_horiz_band(s, 0, s->avctx->height);
finish: finish:
ff_vaapi_common_end_frame(avctx->priv_data); ff_vaapi_common_end_frame(avctx);
return ret; return ret;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment