diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-03 18:41:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-03 18:41:16 +0100 |
| commit | f2cb993139415bd5cadf70d01a9a32a97974df68 (patch) | |
| tree | 8912834be598f83154a14f6c62fdac3ed762c166 | |
| parent | d210e9741e7cff8cdc89b2759d8fb0e4ea2213ab (diff) | |
| download | ffmpeg-f2cb993139415bd5cadf70d01a9a32a97974df68.tar.gz | |
avformat: gather aspect ratio from rv30/40 in find_stream_info
Fixes Ticket1550
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/utils.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 60242056f1..7f90a9a5e0 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2438,6 +2438,9 @@ static int has_codec_parameters(AVStream *st, const char **errmsg_ptr) FAIL("unspecified size"); if (st->info->found_decoder >= 0 && avctx->pix_fmt == AV_PIX_FMT_NONE) FAIL("unspecified pixel format"); + if (st->codec->codec_id == AV_CODEC_ID_RV30 || st->codec->codec_id == AV_CODEC_ID_RV40) + if (!st->sample_aspect_ratio.num && !st->codec->sample_aspect_ratio.num && !st->codec_info_nb_frames) + FAIL("no frame in rv30/40 and no sar"); break; case AVMEDIA_TYPE_SUBTITLE: if (avctx->codec_id == AV_CODEC_ID_HDMV_PGS_SUBTITLE && !avctx->width) |