mirror of https://git.ffmpeg.org/ffmpeg.git
Merge remote-tracking branch 'qatar/master'
* qatar/master: avconv: Make sure the encoder exists before inspecting supported_list Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
38d40ac18a
|
@ -141,7 +141,7 @@ static char *choose_ ## var ## s(OutputStream *ost) \
|
||||||
if (ost->st->codec->var != none) { \
|
if (ost->st->codec->var != none) { \
|
||||||
get_name(ost->st->codec->var); \
|
get_name(ost->st->codec->var); \
|
||||||
return av_strdup(name); \
|
return av_strdup(name); \
|
||||||
} else if (ost->enc->supported_list) { \
|
} else if (ost->enc && ost->enc->supported_list) { \
|
||||||
const type *p; \
|
const type *p; \
|
||||||
AVIOContext *s = NULL; \
|
AVIOContext *s = NULL; \
|
||||||
uint8_t *ret; \
|
uint8_t *ret; \
|
||||||
|
|
Loading…
Reference in New Issue