diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-13 17:34:12 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-13 17:34:16 +0100 |
| commit | e5bb7d98f8c0a345b39ac872967f1edddb8f8bb8 (patch) | |
| tree | 6faf003f52953c6ba9147ef5eac3af8854a0bb24 /libavformat/ftp.c | |
| parent | c1828450686ce240f344924b5b5bcaa84ebdcd9f (diff) | |
| parent | 8b4b1c1eea9daa4e2003aa0935e73f56aab8102d (diff) | |
| download | ffmpeg-e5bb7d98f8c0a345b39ac872967f1edddb8f8bb8.tar.gz | |
Merge commit '8b4b1c1eea9daa4e2003aa0935e73f56aab8102d'
This commit is a no-op.
* commit '8b4b1c1eea9daa4e2003aa0935e73f56aab8102d':
matroska: Support V_QUICKTIME as written in the specification
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/ftp.c')
0 files changed, 0 insertions, 0 deletions