* commit 'c7e921a5':
  avopt: Check whether the object actually has got an AVClass

Conflicts:
	libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>