ffmpeg: fix a crash with complex filters when pix_fmt is not specified

ffmpeg -i in.mxf -filter_complex "[0:0]fieldorder=tff" out.wav will
fail with an error message instead of crashing.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/30/merge
Matthieu Bouron 13 years ago committed by Michael Niedermayer
parent 318e395764
commit 432fe9a38a
  1. 2
      ffmpeg.c

@ -713,7 +713,7 @@ static char *choose_pix_fmts(OutputStream *ost)
} }
if (ost->st->codec->pix_fmt != PIX_FMT_NONE) { if (ost->st->codec->pix_fmt != PIX_FMT_NONE) {
return av_strdup(av_get_pix_fmt_name(choose_pixel_fmt(ost->st, ost->enc, ost->st->codec->pix_fmt))); return av_strdup(av_get_pix_fmt_name(choose_pixel_fmt(ost->st, ost->enc, ost->st->codec->pix_fmt)));
} else if (ost->enc->pix_fmts) { } else if (ost->enc && ost->enc->pix_fmts) {
const enum PixelFormat *p; const enum PixelFormat *p;
AVIOContext *s = NULL; AVIOContext *s = NULL;
uint8_t *ret; uint8_t *ret;

Loading…
Cancel
Save