Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Apr 2013 13:20:05 +0000 (15:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Apr 2013 13:20:05 +0000 (15:20 +0200)
* qatar/master:
  avfiltergraph: check for sws opts being non-NULL before using them.

Conflicts:
libavfilter/avfiltergraph.c
libavfilter/graphparser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/avfiltergraph.c
libavfilter/graphparser.c

  #include <string.h>
  
  #include "libavutil/avassert.h"
+ #include "libavutil/avstring.h"
 +#include "libavutil/bprint.h"
  #include "libavutil/channel_layout.h"
 -#include "libavutil/common.h"
 -#include "libavutil/log.h"
 +#include "libavutil/opt.h"
 +#include "libavutil/pixdesc.h"
 +#include "libavcodec/avcodec.h" // avcodec_find_best_pix_fmt_of_2()
  #include "avfilter.h"
  #include "avfiltergraph.h"
  #include "formats.h"
Simple merge