Merge commit '869b04e89154cd92d2bcfdabcecbe3217864c099'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 09:07:46 +0000 (11:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 09:07:51 +0000 (11:07 +0200)
* commit '869b04e89154cd92d2bcfdabcecbe3217864c099':
  libavutil: add avpriv_open() to open files with close-on-exec flag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/file.c
libavutil/internal.h

Simple merge
Simple merge