diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-04 15:37:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-04 15:37:05 +0100 |
| commit | 073e771c9c5330216bdb3def5bd3ab671930b27f (patch) | |
| tree | 58140d37740badbf5e41340c595212a272139102 /libavformat/aiff.h | |
| parent | 5144d919964f050d953b9dbe6910fb5388a1965d (diff) | |
| parent | 33c859c142ef3f49b7a6227014ad92a680cf4d74 (diff) | |
| download | ffmpeg-073e771c9c5330216bdb3def5bd3ab671930b27f.tar.gz | |
Merge commit '33c859c142ef3f49b7a6227014ad92a680cf4d74'
* commit '33c859c142ef3f49b7a6227014ad92a680cf4d74':
lavf: ignore attachment streams for interleaving purposes
Conflicts:
libavformat/avformat.h
libavformat/internal.h
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aiff.h')
0 files changed, 0 insertions, 0 deletions