[FFmpeg-cvslog] Merge commit '93f29948e4b06acfb96e7f82d373ef86d6dc55f7'
Michael Niedermayer
git at videolan.org
Thu Aug 14 13:01:14 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 14 12:50:40 2014 +0200| [b634c12cb9673428672aa0fb216e866709451e61] | committer: Michael Niedermayer
Merge commit '93f29948e4b06acfb96e7f82d373ef86d6dc55f7'
* commit '93f29948e4b06acfb96e7f82d373ef86d6dc55f7':
mpeg4video: Fix doxygen comment syntax to document correct struct member
Conflicts:
libavcodec/mpeg4video.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b634c12cb9673428672aa0fb216e866709451e61
---
More information about the ffmpeg-cvslog
mailing list