diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 02:14:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 02:14:15 +0100 |
| commit | 71ecfcf2d31e4f906f52c3450f4fb46c5087f50e (patch) | |
| tree | 2b1e8944703b072c4ce61b751147e912a08480ed /ffmpeg_dxva2.c | |
| parent | b83beb131f0d3fdb2d472665f5325f02aeac7d7e (diff) | |
| parent | b9d08c77a44390b0848c06f20bc0e9e951ba6a3c (diff) | |
| download | ffmpeg-71ecfcf2d31e4f906f52c3450f4fb46c5087f50e.tar.gz | |
Merge commit 'b9d08c77a44390b0848c06f20bc0e9e951ba6a3c'
* commit 'b9d08c77a44390b0848c06f20bc0e9e951ba6a3c':
lavf: Don't try to update files atomically with renames on windows
Conflicts:
libavformat/dashenc.c
libavformat/hdsenc.c
libavformat/internal.h
libavformat/smoothstreamingenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_dxva2.c')
0 files changed, 0 insertions, 0 deletions