diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-24 23:44:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-24 23:45:09 +0200 |
| commit | 8f899545502c287653223ca27522c4abcd3a2e91 (patch) | |
| tree | 1b633d81c6104786d65ef05c6da1426bbead30e1 | |
| parent | fe5bc46f60c0ebd82593999520ebff1d230b0483 (diff) | |
| parent | 8c4022aceb68558df655059cef4d570625dc1d09 (diff) | |
| download | ffmpeg-8f899545502c287653223ca27522c4abcd3a2e91.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: fix a segfault on -c copy with -filter_complex.
isom: Support more DTS codec identifiers.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffmpeg.c | 13 | ||||
| -rw-r--r-- | libavformat/isom.c | 4 |
2 files changed, 15 insertions, 2 deletions
@@ -2959,7 +2959,11 @@ static int transcode_init(void) } if (ost->stream_copy) { - uint64_t extra_size = (uint64_t)icodec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE; + uint64_t extra_size; + + av_assert0(ist && !ost->filter); + + extra_size = (uint64_t)icodec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE; if (extra_size > INT_MAX) { return AVERROR(EINVAL); @@ -4893,6 +4897,13 @@ static void init_output_filter(OutputFilter *ofilter, OptionsContext *o, ofilter->ost = ost; + if (ost->stream_copy) { + av_log(NULL, AV_LOG_ERROR, "Streamcopy requested for output stream %d:%d, " + "which is fed from a complex filtergraph. Filtering and streamcopy " + "cannot be used together.\n", ost->file_index, ost->index); + exit_program(1); + } + if (configure_output_filter(ofilter->graph, ofilter, ofilter->out_tmp) < 0) { av_log(NULL, AV_LOG_FATAL, "Error configuring filter.\n"); exit_program(1); diff --git a/libavformat/isom.c b/libavformat/isom.c index 34daeaeeeb..44ec507770 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -245,7 +245,9 @@ const AVCodecTag ff_codec_movaudio_tags[] = { { CODEC_ID_ALAC, MKTAG('a', 'l', 'a', 'c') }, { CODEC_ID_AMR_NB, MKTAG('s', 'a', 'm', 'r') }, /* AMR-NB 3gp */ { CODEC_ID_AMR_WB, MKTAG('s', 'a', 'w', 'b') }, /* AMR-WB 3gp */ - { CODEC_ID_DTS, MKTAG('d', 't', 's', 'c') }, /* mp4ra.org */ + { CODEC_ID_DTS, MKTAG('d', 't', 's', 'c') }, /* DTS formats prior to DTS-HD */ + { CODEC_ID_DTS, MKTAG('d', 't', 's', 'h') }, /* DTS-HD audio formats */ + { CODEC_ID_DTS, MKTAG('d', 't', 's', 'l') }, /* DTS-HD Lossless formats */ { CODEC_ID_DTS, MKTAG('D', 'T', 'S', ' ') }, /* non-standard */ { CODEC_ID_DVAUDIO, MKTAG('v', 'd', 'v', 'a') }, { CODEC_ID_DVAUDIO, MKTAG('d', 'v', 'c', 'a') }, |