History

af_channelmap: ensure the output channel layout is valid.

Anton Khirnov committed 13 years ago

Commit 8aaab111 parent 949c6031 file · +6 −0Browse files

Unified · Split

libavfilter/af_channelmap.c+6−0
@@ -270,6 +270,12 @@ static av_cold int channelmap_init(AVFilterContext *ctx) · 269 unmodified lines
270 }270 }
271 s->output_layout = fmt;271 s->output_layout = fmt;
272 }272 }
273 if (!s->output_layout) {
274 av_log(ctx, AV_LOG_ERROR, "Output channel layout is not set and "
275 "cannot be guessed from the maps.\n");
276 return AVERROR(EINVAL);
277 }
278
273 ff_add_channel_layout(&s->channel_layouts, s->output_layout);279 ff_add_channel_layout(&s->channel_layouts, s->output_layout);
274 280
275 if (mode == MAP_PAIR_INT_STR || mode == MAP_PAIR_STR_STR) {281 if (mode == MAP_PAIR_INT_STR || mode == MAP_PAIR_STR_STR) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t