diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-05 03:17:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-05 03:19:22 +0100 |
| commit | 3adb5f8d8b4006f4188c9c4d6f0925988fadc2f4 (patch) | |
| tree | 5fcd6d5b8350b26839ccea85b7c0db5178f8dcc2 /libavformat/ftp.c | |
| parent | 6a4cc50980783013b19bfb2edaaca14cc38d5c92 (diff) | |
| parent | d9ae1031f5edbd25c8526b4cb51aba66d3bee931 (diff) | |
Merge commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931'
* commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931':
lavf: improve handling of sparse streams when muxing
Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/mux.c
libavformat/options_table.h
libavformat/version.h
See: 37ed5df5c5e06a55724fb9eb215da1594b648282
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ftp.c')
0 files changed, 0 insertions, 0 deletions