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)
* commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f':
  graphparser: Check av_get_token() memory error

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

Simple merge