diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 12:26:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 12:26:36 +0100 |
| commit | fd37a7dc3c1bc09e9f2367dc8487dd5cce9cf291 (patch) | |
| tree | 85304419ac1351aea15f06af44e326a9a28de184 /tests/fate | |
| parent | e63ebaca16b7620441dda9e21b8773ef7e7ae2df (diff) | |
| parent | cf53704c55378cc0dcfc16637cdac7d58f0b3107 (diff) | |
| download | ffmpeg-fd37a7dc3c1bc09e9f2367dc8487dd5cce9cf291.tar.gz | |
Merge commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107'
* commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107':
AVOptions: make av_set_options_string() forward options to child objects
win32: Use 64-bit fstat/lseek variants for MSVC as well
win32: Make ff_win32_open more robust
Conflicts:
libavformat/os_support.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
0 files changed, 0 insertions, 0 deletions