ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Oct 21 
23:47:44 2014 +0200| [979062fe2febb502e8b75e944e61673cf70c79b7] | committer: 
Michael Niedermayer

Merge commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709'

* commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709':
  rmdec: stricter error check to avoid theoretical unitialized use

Conflicts:
        libavformat/rmdec.c

Merged-by: Michael Niedermayer <michae...@gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=979062fe2febb502e8b75e944e61673cf70c79b7
---



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to