ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Mar 12
21:50:36 2015 +0100| [98c387c9c1cd8337b63e6e6544319127f6e82f94] | committer:
Michael Niedermayer
Merge commit 'edca1dd552efa1ebef016ca9eff4ce6757605819'
* commit 'edca1dd552efa1ebef016ca9eff4ce6757605819':
xcbgrab: Check av_strdup() allocation
Conflicts:
libavdevice/xcbgrab.c
See: db442c873631065e8719df6da91c016d25501084
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=98c387c9c1cd8337b63e6e6544319127f6e82f94
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog