diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 15:06:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 15:08:05 +0100 |
| commit | 5972bcfac9106b9615ce1277deeaf6460ff738fc (patch) | |
| tree | e8e5f5201179a7562ac509c7211696e2b920c071 /libavcodec/avuienc.c | |
| parent | 06fe29c41d3a93bd937295523477e4bd6eed934c (diff) | |
| parent | 700687ebe07ac8b7a5cf5fd2c4892ea07a827080 (diff) | |
| download | ffmpeg-5972bcfac9106b9615ce1277deeaf6460ff738fc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
qt-faststart: Add a note about the -movflags +faststart feature
Conflicts:
tools/qt-faststart.c
See: 2574d62d0dd34df762aa2d80c7d6381918a80ed1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avuienc.c')
0 files changed, 0 insertions, 0 deletions