ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b634c12cb9673428672aa0fb216e866709451e61
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
