Merge remote-tracking branch 'qatar/master'

* qatar/master: avconv: Make sure the encoder exists before inspecting supported_list

Michael Niedermayer committed 13 years ago

Commit 38d40ac2 parents fa3a7b5 e760e1d1 file · +1 −1Browse files

Unified · Split

@@ -141,7 +141,7 @@ static char choose_ ## var ## s(OutputStream ost) \ · 140 unmodified lines
141	if (ost->st->codec->var != none) { \	141	if (ost->st->codec->var != none) { \
142	get_name(ost->st->codec->var); \	142	get_name(ost->st->codec->var); \
143	return av_strdup(name); \	143	return av_strdup(name); \
144	} else if (ost->enc->supported_list) { \	144	} else if (ost->enc && ost->enc->supported_list) { \
145	const type *p; \	145	const type *p; \
146	AVIOContext *s = NULL; \	146	AVIOContext *s = NULL; \
147	uint8_t *ret; \	147	uint8_t *ret; \

Keyboard shortcuts