From b066d90211072c7532e17c0c54d8475f10fc97ad Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Thu, 14 Mar 2013 15:12:30 +0100 Subject: vaapi: fix argument for ff_vaapi_common_end_frame call --- libavcodec/vaapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c index 9c07c8d825..0532daf983 100644 --- a/libavcodec/vaapi.c +++ b/libavcodec/vaapi.c @@ -212,7 +212,7 @@ int ff_vaapi_mpeg_end_frame(AVCodecContext *avctx) ff_mpeg_draw_horiz_band(s, 0, s->avctx->height); finish: - ff_vaapi_common_end_frame(avctx->priv_data); + ff_vaapi_common_end_frame(avctx); return ret; } -- cgit v1.2.3 From 3e175a2a550f5c2f788e8cd969052e10a5025a27 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 14 Mar 2013 09:44:07 +0100 Subject: avconv: mark attachment streams as immediately finished There are never any packets for those streams. Fixes an infinite loop with -attach. --- avconv_opt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/avconv_opt.c b/avconv_opt.c index 30fbadf07a..2c43da2bbd 100644 --- a/avconv_opt.c +++ b/avconv_opt.c @@ -1096,6 +1096,7 @@ static OutputStream *new_attachment_stream(OptionsContext *o, AVFormatContext *o { OutputStream *ost = new_output_stream(o, oc, AVMEDIA_TYPE_ATTACHMENT); ost->stream_copy = 1; + ost->finished = 1; return ost; } -- cgit v1.2.3