diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-03 15:20:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-03 15:20:05 +0200 |
| commit | d3fc2db47e8595e737a1d58689d2bf29c9190c80 (patch) | |
| tree | 08691396be93c1f0a7c771e728f027e29689278e /doc/ffplay.texi | |
| parent | 4d636947b4e21eabb01d96ebe57ddc455599a173 (diff) | |
| parent | 6e3c13a559e9ff300b5ca60e1d503e594d7f055c (diff) | |
| download | ffmpeg-d3fc2db47e8595e737a1d58689d2bf29c9190c80.tar.gz | |
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>
Diffstat (limited to 'doc/ffplay.texi')
0 files changed, 0 insertions, 0 deletions