Merge commit 'c7e921a54ffe7feb9f695c82f0a0764ab8d0f62b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 10:30:30 +0000 (12:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 10:30:30 +0000 (12:30 +0200)
commitcca229e75a55a5755abf7dc4547d9dce42e2edc8
tree945e9afd45170ef643b2a948e42743f52bf3be65
parentfcccb4c11dcfcbdbb4b0d6eed5ed276d946c7d13
parentc7e921a54ffe7feb9f695c82f0a0764ab8d0f62b
Merge commit 'c7e921a54ffe7feb9f695c82f0a0764ab8d0f62b'

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

Conflicts:
libavutil/opt.c

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