Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'

* commit '5c7db097ebe1fb5c233cedd8846615074e7d6044':
  avconv: pass libavresample options to AVFilterGraph

Conflicts:
	cmdutils.c
	cmdutils.h
	ffmpeg_filter.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc cmdutils.c
index 7c21176,ee6baa1..50a1ff8
--- 1/cmdutils.c
--- 2/cmdutils.c
+++ b/cmdutils.c
@@@ -59,15 -53,10 +59,15 @@@
  #include <sys/resource.h>
  #endif
  
 +static int init_report(const char *env);
 +
  struct SwsContext *sws_opts;
- AVDictionary *format_opts, *codec_opts;
 +SwrContext *swr_opts;
+ AVDictionary *format_opts, *codec_opts, *resample_opts;
  
 -static const int this_year = 2013;
 +const int this_year = 2013;
 +
 +static FILE *report_file;
  
  void init_opts(void)
  {
@@@ -86,12 -72,9 +86,13 @@@ void uninit_opts(void
      sws_freeContext(sws_opts);
      sws_opts = NULL;
  #endif
 +
 +    if(CONFIG_SWRESAMPLE)
 +        swr_free(&swr_opts);
 +
      av_dict_free(&format_opts);
      av_dict_free(&codec_opts);
+     av_dict_free(&resample_opts);
  }
  
  void log_callback_help(void *ptr, int level, const char *fmt, va_list vl)
@@@ -478,10 -406,10 +479,11 @@@ int opt_default(void *optctx, const cha
      char opt_stripped[128];
      const char *p;
      const AVClass *cc = avcodec_get_class(), *fc = avformat_get_class();
 -    const AVClass *rc = avresample_get_class();
 -#if CONFIG_SWSCALE
 -    const AVClass *sc = sws_get_class();
 -#endif
++    const av_unused AVClass *rc_class;
 +    const AVClass *sc, *swr_class;
 +
 +    if (!strcmp(opt, "debug") || !strcmp(opt, "fdebug"))
 +        av_log_set_level(AV_LOG_DEBUG);
  
      if (!(p = strchr(opt, ':')))
          p = opt + strlen(opt);
@@@ -511,23 -435,10 +513,31 @@@
              av_log(NULL, AV_LOG_ERROR, "Error setting option %s.\n", opt);
              return ret;
          }
 +        consumed = 1;
 +    }
 +#endif
 +#if CONFIG_SWRESAMPLE
 +    swr_class = swr_get_class();
 +    if (!consumed && av_opt_find(&swr_class, opt, NULL, 0,
 +                               AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)) {
 +        int ret = av_opt_set(swr_opts, opt, arg, 0);
 +        if (ret < 0) {
 +            av_log(NULL, AV_LOG_ERROR, "Error setting option %s.\n", opt);
 +            return ret;
 +        }
 +        consumed = 1;
 +    }
 +#endif
++#if CONFIG_AVRESAMPLE
++    rc_class = avresample_get_class();
++    if (av_opt_find(&rc_class, opt, NULL, 0,
++                    AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)) {
++        av_dict_set(&resample_opts, opt, arg, FLAGS);
++        consumed = 1;
+     }
+ #endif
  
 -    if (o)
 +    if (consumed)
          return 0;
      return AVERROR_OPTION_NOT_FOUND;
  }
@@@ -572,9 -483,9 +582,10 @@@ static void finish_group(OptionParseCon
  #if CONFIG_SWSCALE
      g->sws_opts    = sws_opts;
  #endif
 +    g->swr_opts    = swr_opts;
      g->codec_opts  = codec_opts;
      g->format_opts = format_opts;
+     g->resample_opts = resample_opts;
  
      codec_opts  = NULL;
      format_opts = NULL;

diff --cc cmdutils.h
index 71b6a2f,84d9068..3e3d002
--- 1/cmdutils.h
--- 2/cmdutils.h
+++ b/cmdutils.h
@@@ -51,8 -42,7 +51,8 @@@ extern const int this_year
  extern AVCodecContext *avcodec_opts[AVMEDIA_TYPE_NB];
  extern AVFormatContext *avformat_opts;
  extern struct SwsContext *sws_opts;
- extern AVDictionary *format_opts, *codec_opts;
 +extern struct SwrContext *swr_opts;
+ extern AVDictionary *format_opts, *codec_opts, *resample_opts;
  
  /**
   * Initialize the cmdutils option system, in particular
@@@ -253,8 -235,8 +253,9 @@@ typedef struct OptionGroup 
  
      AVDictionary *codec_opts;
      AVDictionary *format_opts;
+     AVDictionary *resample_opts;
      struct SwsContext *sws_opts;
 +    struct SwrContext *swr_opts;
  } OptionGroup;
  
  /**

diff --cc ffmpeg.c
Simple merge

diff --cc ffmpeg.h
index c64a015,da7259e..9582f94
--- 1/ffmpeg.h
--- 2/avconv.h
+++ b/ffmpeg.h
@@@ -346,12 -292,9 +346,13 @@@ typedef struct OutputStream 
      char *avfilter;
  
      int64_t sws_flags;
 +    int64_t swr_filter_type;
 +    int64_t swr_dither_method;
 +    double swr_dither_scale;
      AVDictionary *opts;
+     AVDictionary *resample_opts;
      int finished;        /* no more packets should be written for this stream */
 +    int unavailable;                     /* true if the steram is unavailable (possibly temporarily) */
      int stream_copy;
      const char *attachment_filename;
      int copy_initial_nonkeyframes;

diff --cc ffmpeg_filter.c
index ac3e719,9cef1af..a88e57c
--- 1/ffmpeg_filter.c
--- 2/avconv_filter.c
+++ b/ffmpeg_filter.c
@@@ -22,11 -22,11 +22,13 @@@
  
  #include "libavfilter/avfilter.h"
  #include "libavfilter/avfiltergraph.h"
 +#include "libavfilter/buffersink.h"
  
+ #include "libavresample/avresample.h"
+ 
  #include "libavutil/avassert.h"
  #include "libavutil/avstring.h"
 +#include "libavutil/bprint.h"
  #include "libavutil/channel_layout.h"
  #include "libavutil/opt.h"
  #include "libavutil/pixdesc.h"
@@@ -730,20 -505,21 +732,31 @@@ int configure_filtergraph(FilterGraph *
  
      if (simple) {
          OutputStream *ost = fg->outputs[0]->ost;
-         char args[255];
+         char args[512];
+         AVDictionaryEntry *e = NULL;
 -        const AVClass *rc = avresample_get_class();
+ 
          snprintf(args, sizeof(args), "flags=0x%X", (unsigned)ost->sws_flags);
          fg->graph->scale_sws_opts = av_strdup(args);
  
 +        args[0] = 0;
 +        if (ost->swr_filter_type != SWR_FILTER_TYPE_KAISER)
 +            av_strlcatf(args, sizeof(args), "filter_type=%d:", (int)ost->swr_filter_type);
 +        if (ost->swr_dither_method)
 +            av_strlcatf(args, sizeof(args), "dither_method=%d:", (int)ost->swr_dither_method);
 +        if (ost->swr_dither_scale != 1.0)
 +            av_strlcatf(args, sizeof(args), "dither_scale=%f:", ost->swr_dither_scale);
 +        if (strlen(args))
 +            args[strlen(args)-1] = 0;
 +        av_opt_set(fg->graph, "aresample_swr_opts", args, 0);
++
+         args[0] = '\0';
+         while ((e = av_dict_get(fg->outputs[0]->ost->resample_opts, "", e,
+                                 AV_DICT_IGNORE_SUFFIX))) {
+             av_strlcatf(args, sizeof(args), "%s=%s:", e->key, e->value);
+         }
+         if (strlen(args))
+             args[strlen(args) - 1] = '\0';
+         fg->graph->resample_lavr_opts = av_strdup(args);
      }
  
      if ((ret = avfilter_graph_parse2(fg->graph, graph_desc, &inputs, &outputs)) < 0)

diff --cc ffmpeg_opt.c
index bba9dba,2a40087..c4b886b
--- 1/ffmpeg_opt.c
--- 2/avconv_opt.c
+++ b/ffmpeg_opt.c
@@@ -1002,18 -843,10 +1002,20 @@@ static OutputStream *new_output_stream(
          st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
  
      av_opt_get_int(o->g->sws_opts, "sws_flags", 0, &ost->sws_flags);
 +    av_opt_get_int   (o->g->swr_opts, "filter_type"  , 0, &ost->swr_filter_type);
 +    av_opt_get_int   (o->g->swr_opts, "dither_method", 0, &ost->swr_dither_method);
 +    av_opt_get_double(o->g->swr_opts, "dither_scale" , 0, &ost->swr_dither_scale);
 +    if (ost->enc && av_get_exact_bits_per_sample(ost->enc->id) == 24)
 +        ost->swr_dither_scale = ost->swr_dither_scale*256;
  
 -    ost->pix_fmts[0] = ost->pix_fmts[1] = AV_PIX_FMT_NONE;
+     av_dict_copy(&ost->resample_opts, o->g->resample_opts, 0);
+ 
 +    ost->source_index = source_index;
 +    if (source_index >= 0) {
 +        ost->sync_ist = input_streams[source_index];
 +        input_streams[source_index]->discard = 0;
 +        input_streams[source_index]->st->discard = AVDISCARD_NONE;
 +    }
  
      return ost;
  }