diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-01 12:47:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-01 12:48:55 +0100 |
| commit | 46f4b468e2102467aadf5b91e44b8a0607202ee2 (patch) | |
| tree | 44d63ca9623dcdb86b76baa49534978c4fc4c7c8 | |
| parent | e20f2dc048fd1fccda7ab56fbadd53054439f452 (diff) | |
| parent | cb6f8245aed2c26fe95c30cd68c45983277a945a (diff) | |
| download | ffmpeg-46f4b468e2102467aadf5b91e44b8a0607202ee2.tar.gz | |
Merge commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a'
* commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a':
cmdutils: Allow calling filter_codec_opts without a set encoder
pnm: Use av_pix_fmt_desc_get instead of accessing the array directly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | cmdutils.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cmdutils.c b/cmdutils.c index 36a80c6740..c6fde336bd 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1749,10 +1749,8 @@ AVDictionary *filter_codec_opts(AVDictionary *opts, enum AVCodecID codec_id, if (!codec) codec = s->oformat ? avcodec_find_encoder(codec_id) : avcodec_find_decoder(codec_id); - if (!codec) - return NULL; - switch (codec->type) { + switch (st->codec->codec_type) { case AVMEDIA_TYPE_VIDEO: prefix = 'v'; flags |= AV_OPT_FLAG_VIDEO_PARAM; |