| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-06 23:27:53 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-06 23:28:15 (GMT) |
| commit | 38d40ac18a3855620852e6552114caeb413497eb (patch) | |
| tree | 60169e2c9159a1cac69d4a4239ba27c507221da7 | |
| parent | fa3a7b55ec1be2a5274d7349d3aa1faed14d2bcb (diff) | |
| parent | e760e1d408261566814e24c43119d7aca538d2eb (diff) | |
| download | ffmpeg-38d40ac18a3855620852e6552114caeb413497eb.zip ffmpeg-38d40ac18a3855620852e6552114caeb413497eb.tar.gz ffmpeg-38d40ac18a3855620852e6552114caeb413497eb.tar.bz2 | |
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>
| -rw-r--r-- | ffmpeg_filter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index 1919f78..bdf4363 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -141,7 +141,7 @@ static char *choose_ ## var ## s(OutputStream *ost) \ if (ost->st->codec->var != none) { \ get_name(ost->st->codec->var); \ return av_strdup(name); \ - } else if (ost->enc->supported_list) { \ + } else if (ost->enc && ost->enc->supported_list) { \ const type *p; \ AVIOContext *s = NULL; \ uint8_t *ret; \ |