ffmpeg | branch: master | Jun Zhao <mypopy...@gmail.com> | Fri Jun 24 15:06:08 2016 +0800| [a06acfff76caf1eabc5e4fc6595905cdb5cb7045] | committer: Michael Niedermayer
ffmpeg_opt: Delete duplicate “hwaccel_output_format” option. Delete duplicate “hwaccel_output_format” option. Signed-off-by: Jun Zhao <mypopy...@gmail.com> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a06acfff76caf1eabc5e4fc6595905cdb5cb7045 --- ffmpeg_opt.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 7785a30..68bd090 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -3384,9 +3384,6 @@ const OptionDef options[] = { { "hwaccel_output_format", OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT | OPT_SPEC | OPT_INPUT, { .off = OFFSET(hwaccel_output_formats) }, "select output format used with HW accelerated decoding", "format" }, - { "hwaccel_output_format", OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT | - OPT_SPEC | OPT_INPUT, { .off = OFFSET(hwaccel_output_formats) }, - "select output format used with HW accelerated decoding", "format" }, #if CONFIG_VDA || CONFIG_VIDEOTOOLBOX { "videotoolbox_pixfmt", HAS_ARG | OPT_STRING | OPT_EXPERT, { &videotoolbox_pixfmt}, "" }, #endif _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
