Merge commit 'a76d0cdf21c3d9e464623cc0ad1c005abf952afa'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 10 Aug 2013 08:36:18 +0000 (10:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 10 Aug 2013 08:37:20 +0000 (10:37 +0200)
commitef13a005c41c353b03b29edf7a20d226747dac4e
treedb2ab0666a1a38a397fa056c8f0a825e1d75f29c
parente3a296dfa53ba78360d7f2c8c931db3490b06d5b
parenta76d0cdf21c3d9e464623cc0ad1c005abf952afa
Merge commit 'a76d0cdf21c3d9e464623cc0ad1c005abf952afa'

* commit 'a76d0cdf21c3d9e464623cc0ad1c005abf952afa':
  libavutil: Move avpriv_open to a new file, file_open.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/Makefile
libavutil/file.c
libavutil/file_open.c