ffmpeg | branch: release/2.4 | Michael Niedermayer <[email protected]> | Sun Jan
18 01:22:14 2015 +0100| [d3316c3f85c291f6875e3cc56dae2ccea1f15f09] | committer:
Michael Niedermayer
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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d3316c3f85c291f6875e3cc56dae2ccea1f15f09
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
