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 /cmdutils.c | |
| 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 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmdutils.c b/cmdutils.c index 5ede436e1f..9542bbf091 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -864,7 +864,7 @@ int check_stream_specifier(AVFormatContext *s, AVStream *st, const char *spec) { if (*spec <= '9' && *spec >= '0') /* opt:index */ return strtol(spec, NULL, 0) == st->index; - else if (*spec == 'v' || *spec == 'a' || *spec == 's' || *spec == 'd') { /* opt:[vasd] */ + else if (*spec == 'v' || *spec == 'a' || *spec == 's' || *spec == 'd' || *spec == 't') { /* opt:[vasdt] */ enum AVMediaType type; switch (*spec++) { @@ -872,6 +872,7 @@ int check_stream_specifier(AVFormatContext *s, AVStream *st, const char *spec) case 'a': type = AVMEDIA_TYPE_AUDIO; break; case 's': type = AVMEDIA_TYPE_SUBTITLE; break; case 'd': type = AVMEDIA_TYPE_DATA; break; + case 't': type = AVMEDIA_TYPE_ATTACHMENT; break; default: abort(); // never reached, silence warning } if (type != st->codec->codec_type) |