From 7b2dba1c50c92c76f147727be7c27872252e29f6 Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Sun, 25 Dec 2011 19:31:23 +0100 Subject: [PATCH] dv: fix avpriv_dv_codec_profile with lowres > 0 Fixes ticket #44. Signed-off-by: Marton Balint Signed-off-by: Michael Niedermayer --- libavcodec/dvdata.c | 6 +++--- libavformat/dv.c | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/libavcodec/dvdata.c b/libavcodec/dvdata.c index b29f5ce53f..f292d4bf19 100644 --- a/libavcodec/dvdata.c +++ b/libavcodec/dvdata.c @@ -287,9 +287,9 @@ const DVprofile* avpriv_dv_codec_profile(AVCodecContext* codec) int i; for (i=0; iheight == dv_profiles[i].height && - codec->pix_fmt == dv_profiles[i].pix_fmt && - codec->width == dv_profiles[i].width) + if (codec->coded_height == dv_profiles[i].height && + codec->pix_fmt == dv_profiles[i].pix_fmt && + codec->coded_width == dv_profiles[i].width) return &dv_profiles[i]; return NULL; diff --git a/libavformat/dv.c b/libavformat/dv.c index 69c0de95c3..d99dee3782 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -251,10 +251,8 @@ static int dv_extract_video_info(DVDemuxContext *c, uint8_t* frame) avpriv_set_pts_info(c->vst, 64, c->sys->time_base.num, c->sys->time_base.den); avctx->time_base= c->sys->time_base; - if (!avctx->width){ - avctx->width = c->sys->width; - avctx->height = c->sys->height; - } + if (!avctx->width) + avcodec_set_dimensions(avctx, c->sys->width, c->sys->height); avctx->pix_fmt = c->sys->pix_fmt; /* finding out SAR is a little bit messy */