-
由 Michael Niedermayer 提交于
* commit '9b56ac74': mpjpeg: Initial implementation Conflicts: Changelog libavformat/allformats.c libavformat/version.h Merged-by: NMichael Niedermayer <michaelni@gmx.at>
8985e7c5
* commit '9b56ac74': mpjpeg: Initial implementation Conflicts: Changelog libavformat/allformats.c libavformat/version.h Merged-by: NMichael Niedermayer <michaelni@gmx.at>