ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Jun 1 00:57:07 2015 +0200| [9e1cdfb89be553b8d21239a7eeaa0d1bc0cbbf5a] | committer: Michael Niedermayer
Merge commit '5c720657c23afd798ae0db7c7362eb859a89ab3d' * commit '5c720657c23afd798ae0db7c7362eb859a89ab3d': mov: always check avio_read return value Conflicts: libavformat/mov.c See: b71528d8967c1e10f499432fe26ff4713d1fd3b6 Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9e1cdfb89be553b8d21239a7eeaa0d1bc0cbbf5a --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog