[FFmpeg-cvslog] Merge commit '036f5c5420e4529f05fa5180f5fa28ca2c5c4065' into release/2.4

Michael Niedermayer git at videolan.org
Sun Jan 18 00:36:49 CET 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 00:24:57 2015 +0100| [365e0652f94df616a5b94b2ad8602d1a1d875597] | committer: Michael Niedermayer

Merge commit '036f5c5420e4529f05fa5180f5fa28ca2c5c4065' into release/2.4

* commit '036f5c5420e4529f05fa5180f5fa28ca2c5c4065':
  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=365e0652f94df616a5b94b2ad8602d1a1d875597
---





More information about the ffmpeg-cvslog mailing list