diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-15 12:34:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-15 12:54:05 +0100 |
| commit | 9df00574fca16b3c8aa9892f9a3ed5bd6482833a (patch) | |
| tree | 09b4db98560b0bc4463a4edb8b96a1c208fbd7fe | |
| parent | 8a523cfa8b922885ba4f2e9a5e7a2ac3b7bcb54b (diff) | |
| parent | 3e175a2a550f5c2f788e8cd969052e10a5025a27 (diff) | |
| download | ffmpeg-9df00574fca16b3c8aa9892f9a3ed5bd6482833a.tar.gz | |
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>
| -rw-r--r-- | ffmpeg_opt.c | 1 | ||||
| -rw-r--r-- | libavcodec/vaapi.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 39fb3b43f7..e6fab2a55c 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -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); ost->stream_copy = 1; + ost->finished = 1; return ost; } diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c index fc869bdc61..a220a9d3c2 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; } |