Merge commit '93f29948e4b06acfb96e7f82d373ef86d6dc55f7'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Aug 2014 10:50:40 +0000 (12:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Aug 2014 10:50:40 +0000 (12:50 +0200)
commitb634c12cb9673428672aa0fb216e866709451e61
tree2c37c4a28228e4b961c95e2f83ef0554e339b3e5
parent8d403d9c89febcbca094206a866c82426fbcd1c8
parent93f29948e4b06acfb96e7f82d373ef86d6dc55f7
Merge commit '93f29948e4b06acfb96e7f82d373ef86d6dc55f7'

* commit '93f29948e4b06acfb96e7f82d373ef86d6dc55f7':
  mpeg4video: Fix doxygen comment syntax to document correct struct member

Conflicts:
libavcodec/mpeg4video.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg4video.h