Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'

* commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06':
  avconv: use new options parser.

Conflicts:
	ffmpeg.c
	ffmpeg.h
	ffmpeg_opt.c

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

cmdutils.h

@@ -254,6 +254,7 @@ typedef struct OptionGroup {
     AVDictionary *codec_opts;
     AVDictionary *format_opts;
     struct SwsContext *sws_opts;
+    struct SwrContext *swr_opts;
 } OptionGroup;
 
 /**