texturedsp: Explicitly cast RGBA parameters to unsigned

[ffmpeg] / avconv_opt.c

diff --git a/avconv_opt.c b/avconv_opt.c
index 3b841356ccc3dc8e0392a51bca1c2b3ae4f1d1b6..8fe53e61682c91d2ebacd5a974d37e0f875a3f4d 100644 (file)
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -64,6 +64,9 @@ const HWAccel hwaccels[] = {
 #endif
 #if CONFIG_VDA
     { "vda",   vda_init,   HWACCEL_VDA,   AV_PIX_FMT_VDA },
+#endif
+#if CONFIG_LIBMFX
+    { "qsv",   qsv_init,   HWACCEL_QSV,   AV_PIX_FMT_QSV },
 #endif
     { 0 },
 };
@@ -498,6 +501,9 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
         ist->file_index = nb_input_files;
         ist->discard = 1;
         st->discard  = AVDISCARD_ALL;
+        ist->nb_samples = 0;
+        ist->min_pts = INT64_MAX;
+        ist->max_pts = INT64_MIN;
 
         ist->ts_scale = 1.0;
         MATCH_PER_STREAM_OPT(ts_scale, dbl, ist->ts_scale, ic, st);
@@ -783,6 +789,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;
+    f->loop = o->loop;
+    f->duration = 0;
+    f->time_base = (AVRational){ 1, 1 };
 
     /* check if all codec options have been used */
     unused_opts = strip_specifiers(o->g->codec_opts);
@@ -2100,63 +2109,6 @@ static int opt_filter_complex_script(void *optctx, const char *opt, const char *
     return 0;
 }
 
-/* Search a class from a codec, format, or filter, named 'opt', in order
- * to extract its private options. If the class type is specified, only
- * the associated options are printed, otherwise all the ones matching
- * the input name are shown. */
-static int show_help_specific(const char *opt)
-{
-    AVCodec *codec = NULL;
-    AVFilter *filter = NULL;
-    AVInputFormat *iformat = NULL;
-    AVOutputFormat *oformat = NULL;
-    int flags = AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM |
-                AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM;
-
-    char *kind = av_get_token(&opt, ":");
-    if (!kind)
-        return 0;
-    if (*opt)
-        opt = &opt[1]; // skip ':'
-
-    show_usage();
-
-    if (!strcmp(kind, "decoder") &&
-        (codec = avcodec_find_decoder_by_name(opt)) && codec->priv_class)
-        show_help_children(codec->priv_class, flags);
-    else if (!strcmp(kind, "encoder") &&
-             (codec = avcodec_find_encoder_by_name(opt)) && codec->priv_class)
-        show_help_children(codec->priv_class, flags);
-    else if (!strcmp(kind, "demuxer") &&
-             (iformat = av_find_input_format(opt)) && iformat->priv_class)
-        show_help_children(iformat->priv_class, flags);
-    else if (!strcmp(kind, "muxer") &&
-             (oformat = av_guess_format(opt, NULL, NULL)) && oformat->priv_class)
-        show_help_children(oformat->priv_class, flags);
-    else if (!strcmp(kind, "filter") &&
-             (filter = avfilter_get_by_name(opt)) && filter->priv_class)
-        show_help_children(filter->priv_class, flags);
-    else if (!opt)
-        av_log(NULL, AV_LOG_ERROR,
-               "Unknown class '%s', only 'decoder', 'encoder', 'demuxer', "
-               "'muxer', or 'filter' are valid specifiers.\n", kind);
-    else {
-        if ((codec = avcodec_find_decoder_by_name(kind)) && codec->priv_class)
-            show_help_children(codec->priv_class, flags);
-        if ((codec = avcodec_find_encoder_by_name(kind)) && codec->priv_class)
-            show_help_children(codec->priv_class, flags);
-        if ((iformat = av_find_input_format(kind)) && iformat->priv_class)
-            show_help_children(iformat->priv_class, flags);
-        if ((oformat = av_guess_format(kind, NULL, NULL)) && oformat->priv_class)
-            show_help_children(oformat->priv_class, flags);
-        if ((filter = avfilter_get_by_name(kind)) && filter->priv_class)
-            show_help_children(filter->priv_class, flags);
-    }
-    av_freep(&kind);
-
-    return codec || iformat || oformat || filter;
-}
-
 void show_help_default(const char *opt, const char *arg)
 {
     /* per-file options have at least one of those set */
@@ -2168,8 +2120,6 @@ void show_help_default(const char *opt, const char *arg)
             show_advanced = 1;
         else if (!strcmp(opt, "full"))
             show_advanced = show_avoptions = 1;
-        else if (show_help_specific(opt))
-            return;
         else
             av_log(NULL, AV_LOG_ERROR, "Unknown help option '%s'.\n", opt);
     }
@@ -2180,7 +2130,7 @@ void show_help_default(const char *opt, const char *arg)
            "    -h      -- print basic options\n"
            "    -h long -- print more options\n"
            "    -h full -- print all options (including all format and codec specific options, very long)\n"
-           "    -h [type:]name -- print private options from a codec, format or filter named 'name' (set 'type' to print options from a single class)\n"
+           "    -h type=name -- print all options for the named decoder/encoder/demuxer/muxer/filter\n"
            "    See man %s for detailed description of the options.\n"
            "\n", program_name);
 
@@ -2450,6 +2400,8 @@ const OptionDef options[] = {
     { "dump_attachment", HAS_ARG | OPT_STRING | OPT_SPEC |
                          OPT_EXPERT | OPT_INPUT,                     { .off = OFFSET(dump_attachment) },
         "extract an attachment into a file", "filename" },
+    { "loop", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_INPUT |
+                        OPT_OFFSET,                                  { .off = OFFSET(loop) }, "set number of times input stream shall be looped", "loop count" },
 
     /* video options */
     { "vframes",      OPT_VIDEO | HAS_ARG  | OPT_PERFILE | OPT_OUTPUT,           { .func_arg = opt_video_frames },