[FFmpeg-cvslog] Merge commit 'cbfdbba58e1460bd0791911ad84a6c76b5500a0e' into release/2.4

Michael Niedermayer git at videolan.org
Sat Jan 17 23:20:42 CET 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 17 23:14:06 2015 +0100| [e7b8fa2c005b8f5395be0fa14683d4fe58692d37] | committer: Michael Niedermayer

Merge commit 'cbfdbba58e1460bd0791911ad84a6c76b5500a0e' into release/2.4

* commit 'cbfdbba58e1460bd0791911ad84a6c76b5500a0e':
  cmdutils: check file access functions return values

Conflicts:
	cmdutils.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list