[FFmpeg-cvslog] Merge commit '8a2250344b19a343d830a902dbcf4c0b929ea49b'
Michael Niedermayer
git at videolan.org
Fri Feb 14 02:05:45 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 14 01:47:06 2014 +0100| [abb6821e43e74bfce1565c4a6ed75cfb666a2e6d] | committer: Michael Niedermayer
Merge commit '8a2250344b19a343d830a902dbcf4c0b929ea49b'
* commit '8a2250344b19a343d830a902dbcf4c0b929ea49b':
jv: detect partial packets in the demuxer
Conflicts:
libavformat/jvdec.c
See: 9d0c71e5e34dec2c6246bf47da8d9674c92f85c1
See: b948ab8132e24d215072120e210139dc456d4997
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=abb6821e43e74bfce1565c4a6ed75cfb666a2e6d
---
More information about the ffmpeg-cvslog
mailing list