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)
commitd3fc2db47e8595e737a1d58689d2bf29c9190c80
tree08691396be93c1f0a7c771e728f027e29689278e
parent4d636947b4e21eabb01d96ebe57ddc455599a173
parent6e3c13a559e9ff300b5ca60e1d503e594d7f055c
Merge remote-tracking branch 'qatar/master'

* 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>
libavfilter/avfiltergraph.c
libavfilter/graphparser.c