ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Jan 27 14:24:41 2015 +0100| [b6938c94d641c539f1ee5225f6af7ffb58d3a0fc] | committer: Michael Niedermayer
Merge commit '7e850fa67e32ebe98581c2e4ca4a4655dee7f116' * commit '7e850fa67e32ebe98581c2e4ca4a4655dee7f116': Add DXVA2 HEVC HWAccel Conflicts: configure libavcodec/allcodecs.c libavcodec/dxva2_hevc.c See: 36962ad2339d003f327336afd6d00ad3a5a58816 Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b6938c94d641c539f1ee5225f6af7ffb58d3a0fc --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog