ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed Apr 29
03:45:27 2015 +0200| [27801500eed36a19adc89a395e45085ddb9d8969] | committer:
Michael Niedermayer
Merge commit '3919a4572690894d0a7ad4170d699c52b4748194'
* commit '3919a4572690894d0a7ad4170d699c52b4748194':
jpeglsenc: Check memory allocations
Conflicts:
libavcodec/jpeglsenc.c
See: 48214956b2f115e9cadfcdf1ff06a2477c87a295
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=27801500eed36a19adc89a395e45085ddb9d8969
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
