ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Jul 11 12:18:52 2014 +0200| [e1f4397e74f0a21c10e74eabb87f6fe601d6791f] | committer: Michael Niedermayer
Merge commit '458e7c94830d1522997e33a0b5e87bd709e8a349' * commit '458e7c94830d1522997e33a0b5e87bd709e8a349': hevc: implement pic_output_flag handling Conflicts: libavcodec/hevc.c libavcodec/hevc_refs.c See: 2eddf3a6efd80aa6e9d7f42ad9a892a82c5ece70 Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1f4397e74f0a21c10e74eabb87f6fe601d6791f --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog