[FFmpeg-cvslog] Merge commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 17 20:48:05 2015 +0100| [9d5017a20c26b98bdd6fec29f3eaa465a779e24c] | committer: Michael Niedermayer

Merge commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d5017a20c26b98bdd6fec29f3eaa465a779e24c
---