Merge commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 19:48:05 +0000 (20:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 19:48:22 +0000 (20:48 +0100)
commit9d5017a20c26b98bdd6fec29f3eaa465a779e24c
treec8377c0d1e5f9a1295b76e2eb3e41959b17c3053
parenta4cd057bc7ddd2dd094d2ae7b0d6843ade95a626
parent9d3b752fceb0f2a42cac7c2a1109b0629823c99f
Merge commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f'

* commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f':
  graphparser: Check av_get_token() memory error

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