diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-26 21:38:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-26 21:38:52 +0100 |
| commit | 19dbe89f03d0fc97a43a4ac7989e7db2d5bf313b (patch) | |
| tree | f879c4d4aa6f0aa182c08ec4bebfc166d37713e7 /ffmpeg_opt.c | |
| parent | 50833c9f7b4e1922197a8955669f8ab3589c8cef (diff) | |
| parent | d92c6d82c03b89d565f70e7a8e5b03b25f78f70c (diff) | |
| download | ffmpeg-19dbe89f03d0fc97a43a4ac7989e7db2d5bf313b.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
ffmpeg: notify when the thread message queue blocks.
ffmpeg: allow to set the thread message queue size.
lavd/alsa: set frame_size field.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 09e6e33b5c..39c5f49d67 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -951,6 +951,9 @@ static int open_input_file(OptionsContext *o, const char *filename) f->nb_streams = ic->nb_streams; f->rate_emu = o->rate_emu; f->accurate_seek = o->accurate_seek; +#if HAVE_PTHREADS + f->thread_queue_size = o->thread_queue_size > 0 ? o->thread_queue_size : 8; +#endif /* check if all codec options have been used */ unused_opts = strip_specifiers(o->g->codec_opts); @@ -2957,6 +2960,9 @@ const OptionDef options[] = { { "disposition", OPT_STRING | HAS_ARG | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(disposition) }, "disposition", "" }, + { "thread_queue_size", HAS_ARG | OPT_INT | OPT_OFFSET | OPT_EXPERT | OPT_INPUT, + { .off = OFFSET(thread_queue_size) }, + "set the maximum number of queued packets from the demuxer" }, /* video options */ { "vframes", OPT_VIDEO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_video_frames }, |