diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:22:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:22:14 +0100 |
| commit | d3316c3f85c291f6875e3cc56dae2ccea1f15f09 (patch) | |
| tree | dba644ba851a517bfb896148a30307f52ffef186 /libavformat/file_open.c | |
| parent | 324797eb83dff7708a464e2ff61dd1551cc5c058 (diff) | |
| parent | 19fc283dbb53a5f7d6658fd4edcfa59b99369b58 (diff) | |
| download | ffmpeg-d3316c3f85c291f6875e3cc56dae2ccea1f15f09.tar.gz | |
Merge commit '19fc283dbb53a5f7d6658fd4edcfa59b99369b58' into release/2.4
* commit '19fc283dbb53a5f7d6658fd4edcfa59b99369b58':
lavf: replace rename() with ff_rename()
Conflicts:
libavformat/hdsenc.c
libavformat/internal.h
See: 95d2fc6a76f3e0a98329f1ca70f98e7c085f0abf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/file_open.c')
0 files changed, 0 insertions, 0 deletions