ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Aug 12 16:39:20 2014 +0200| [17cbc6457b7a0c38fececc3e0ecff99cc8c96526] | committer: Michael Niedermayer
Merge commit 'cf6090dc6252f2b276aa4133e3d73a89f4c6046c' * commit 'cf6090dc6252f2b276aa4133e3d73a89f4c6046c': hevc: use intreadwrite Conflicts: libavcodec/hevc_mvs.c See: 7a4a5515b0ce97f1c4e18ed012cc3f86328dd220 Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17cbc6457b7a0c38fececc3e0ecff99cc8c96526 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog