ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Aug 12 15:58:37 2014 +0200| [2278146a0ca06ab88cc4885f9f7b1d56eff9873f] | committer: Michael Niedermayer
Merge commit 'd1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574' * commit 'd1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574': hevc: reorder loops Conflicts: libavcodec/hevc.c See: eca1957c4cbee66a0b1f3dcabaffe68d61885f16 Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2278146a0ca06ab88cc4885f9f7b1d56eff9873f --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog