Unified · Split
| @@ -2612,7 +2612,11 @@ static int transcode_init(void) · 2611 unmodified lines | |||
| 2612 | } | 2612 | } |
| 2613 | 2613 | ||
| 2614 | if (ost->stream_copy) { | 2614 | if (ost->stream_copy) { |
| 2615 | uint64_t extra_size = (uint64_t)icodec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE; | 2615 | uint64_t extra_size; |
| 2616 | |||
| 2617 | av_assert0(ist && !ost->filter); | ||
| 2618 | |||
| 2619 | extra_size = (uint64_t)icodec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE; | ||
| 2616 | 2620 | ||
| 2617 | if (extra_size > INT_MAX) { | 2621 | if (extra_size > INT_MAX) { |
| 2618 | return AVERROR(EINVAL); | 2622 | return AVERROR(EINVAL); |
| @@ -4194,6 +4198,13 @@ static void init_output_filter(OutputFilter *ofilter, OptionsContext *o, · 1575 unmodified lines | |||
| 4194 | 4198 | ||
| 4195 | ofilter->ost = ost; | 4199 | ofilter->ost = ost; |
| 4196 | 4200 | ||
| 4201 | if (ost->stream_copy) { | ||
| 4202 | av_log(NULL, AV_LOG_ERROR, "Streamcopy requested for output stream %d:%d, " | ||
| 4203 | "which is fed from a complex filtergraph. Filtering and streamcopy " | ||
| 4204 | "cannot be used together.\n", ost->file_index, ost->index); | ||
| 4205 | exit_program(1); | ||
| 4206 | } | ||
| 4207 | |||
| 4197 | if (configure_output_filter(ofilter->graph, ofilter, ofilter->out_tmp) < 0) { | 4208 | if (configure_output_filter(ofilter->graph, ofilter, ofilter->out_tmp) < 0) { |
| 4198 | av_log(NULL, AV_LOG_FATAL, "Error configuring filter.\n"); | 4209 | av_log(NULL, AV_LOG_FATAL, "Error configuring filter.\n"); |
| 4199 | exit_program(1); | 4210 | exit_program(1); |