[FFmpeg-cvslog] Merge commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 20 11:50:10 2015 +0200| [57f49fa0edafd82315aa3a409ce1051f7dea6981] | committer: Michael Niedermayer

Merge commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08'

* commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08':
  filtfmts: Avoid null pointer dereference

Conflicts:
	libavfilter/filtfmts.c

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

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