ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Nov 13
14:53:14 2014 +0100| [45660c7d1b76185de97160808d81885f9dd08e23] | committer:
Michael Niedermayer
Merge commit '59846452af762f6af5ced4399e8dcd709ca50fcd'
* commit '59846452af762f6af5ced4399e8dcd709ca50fcd':
svq1enc: check ff_get_buffer return value
Conflicts:
libavcodec/svq1enc.c
See: 7effc26ba74717bb9c808d96791c7cf98911d1a1
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=45660c7d1b76185de97160808d81885f9dd08e23
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
