ffmpeg | branch: release/2.2 | Michael Niedermayer <[email protected]> | Mon Aug
11 18:40:48 2014 +0200| [3301b248b0338ca53ad24ae77677bd733ed9d063] | committer:
Michael Niedermayer
Merge commit '5bf5a35fb5d452ea4b30cd7b853d92df6705d250' into release/2.2
* commit '5bf5a35fb5d452ea4b30cd7b853d92df6705d250':
cdgraphics: switch to bytestream2
Conflicts:
libavcodec/cdgraphics.c
See: ad002e1a13a8df934bd6cb2c84175a4780ab8942
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3301b248b0338ca53ad24ae77677bd733ed9d063
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
