ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Oct 20
22:35:15 2014 +0200| [5753d96771450ea4bf978164e8ba76fbdf9c55ee] | committer:
Michael Niedermayer
Merge commit '96bfb677478514db73d1b63b4213c97ad4269e8f'
* commit '96bfb677478514db73d1b63b4213c97ad4269e8f':
nutdec: Prevent a memory corruption
Conflicts:
libavformat/nutdec.c
See: 05dd5368a92718f3a25f97f4697acffbabc7458f
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5753d96771450ea4bf978164e8ba76fbdf9c55ee
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
