diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 04:24:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 04:24:16 +0200 |
| commit | 97a8f4dd119e76218ede40bd94b562f94c79b9e7 (patch) | |
| tree | 3b7ac1b3cf01d859f2545012a8411fff4114c66d /libswscale | |
| parent | af89c144181f4a7003477c22a88d40b366b42a7c (diff) | |
| parent | 7785ce1c769369abf85b276148548a5510aabb5f (diff) | |
Merge commit '7785ce1c769369abf85b276148548a5510aabb5f'
* commit '7785ce1c769369abf85b276148548a5510aabb5f':
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 'libswscale')
0 files changed, 0 insertions, 0 deletions