diff options
| author | Marton Balint <cus@passwd.hu> | 2011-12-25 19:31:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-26 22:12:20 +0100 |
| commit | 7b2dba1c50c92c76f147727be7c27872252e29f6 (patch) | |
| tree | 424ee34540b069de28fc5249ba919f7bd991808d | |
| parent | 084bd109fcaaddd30d90601aff1f987abebadbfb (diff) | |
dv: fix avpriv_dv_codec_profile with lowres > 0
Fixes ticket #44.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dvdata.c | 6 | ||||
| -rw-r--r-- | 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; i<FF_ARRAY_ELEMS(dv_profiles); i++) - if (codec->height == 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 */ |