diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-28 01:31:38 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-28 02:07:44 +0200 |
commit | 23c1db9b83b5928a312b8d7cd753d04d49c252b6 (patch) | |
tree | 2bd8a38bed63003a8ed606a8c1b85c9a8f208548 /libavcodec/faxcompr.h | |
parent | feca3ba053499e0d38f48910cef9bc431036956f (diff) | |
parent | d3c1d37a9019ed32a1710d53c1ad08c44bd072da (diff) | |
download | ffmpeg-23c1db9b83b5928a312b8d7cd753d04d49c252b6.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: use different variables for decoded and filtered frame.
avconv: add support for copying attachments.
matroskaenc: write attachments.
matroskadec: export mimetype of attachments as metadata.
avconv: factorize common code from new_*_stream()
doc/avconv: expand documentation for some options.
doc/avconv: document -timelimit.
Conflicts:
avconv.c
cmdutils.c
tests/codec-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/faxcompr.h')
0 files changed, 0 insertions, 0 deletions