ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Wed Jan 28 22:41:39 2015 +0100| [72db3c79dfddbeae82c540c785c680654a77b063] | committer: Michael Niedermayer
Merge commit '61928b68dc28e080b8c8191afe5541123c682bbd' * commit '61928b68dc28e080b8c8191afe5541123c682bbd': h264: Do not share rbsp_buffer across threads Conflicts: libavcodec/h264.c See: ecbf838c7d81ebd3b89fe75d83ff29150dbda27a Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=72db3c79dfddbeae82c540c785c680654a77b063 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog