[FFmpeg-cvslog] Merge commit 'c7e921a54ffe7feb9f695c82f0a0764ab8d0f62b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  1 12:30:30 2013 +0200| [cca229e75a55a5755abf7dc4547d9dce42e2edc8] | committer: Michael Niedermayer

Merge commit 'c7e921a54ffe7feb9f695c82f0a0764ab8d0f62b'

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

Conflicts:
	libavutil/opt.c

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

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