Merge commit '9b56ac74'
* commit '9b56ac74': mpjpeg: Initial implementation Conflicts: Changelog libavformat/allformats.c libavformat/version.h Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
libavformat/mpjpegdec.c
0 → 100644
想要评论请 注册 或 登录