ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Dec 27 12:52:59 2014 +0100| [ddb9a24a7f11c448263ef9b163e8425832cb089c] | committer: Michael Niedermayer
Merge commit '6c99c92a42add7f6a462114d5a4a53c93c551058' * commit '6c99c92a42add7f6a462114d5a4a53c93c551058': libavcodec: add AV_HWACCEL_ALLOW_HIGH_DEPTH flag Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ddb9a24a7f11c448263ef9b163e8425832cb089c --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog