[FFmpeg-cvslog] Merge commit '1c77ead1fb14d64e6798fc5e32af04abcb3cebb4'
Michael Niedermayer
git at videolan.org
Sat Dec 6 00:50:47 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 6 00:41:00 2014 +0100| [ef2f9073dda3a1ce73f44d444bc27fae5707f396] | committer: Michael Niedermayer
Merge commit '1c77ead1fb14d64e6798fc5e32af04abcb3cebb4'
* commit '1c77ead1fb14d64e6798fc5e32af04abcb3cebb4':
rm: Use the correct codec_data_size signedness
Conflicts:
libavformat/rm.h
libavformat/rmdec.c
See: a6f730730b82645a9d31aad0968487cb77d6946c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef2f9073dda3a1ce73f44d444bc27fae5707f396
---
More information about the ffmpeg-cvslog
mailing list