ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Wed Jul 8
23:53:08 2015 +0200| [2a33dc2cdf6d62204f6f5c425c185d714403daa6] | committer:
Michael Niedermayer
Merge commit 'd09b4cce21cdad5ef2855698395ffd6e37445212'
* commit 'd09b4cce21cdad5ef2855698395ffd6e37445212':
mpjpeg: Simplify using avio_printf
Conflicts:
libavformat/mpjpeg.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a33dc2cdf6d62204f6f5c425c185d714403daa6
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
