generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dv: fix avpriv_dv_codec_profile with lowres > 0

Browse Source 
Fixes ticket #44.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Marton Balint 2011-12-25 19:31:23 +01:00 committed by Michael Niedermayer
parent 084bd109fc
commit 7b2dba1c50
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dvdata.c
View File

@ -287,9 +287,9 @@ const DVprofile* avpriv_dv_codec_profile(AVCodecContext* codec)
int i; int i;
for (i=0; i<FF_ARRAY_ELEMS(dv_profiles); i++) for (i=0; i<FF_ARRAY_ELEMS(dv_profiles); i++)
if (codec->height == dv_profiles[i].height && if (codec->coded_height == dv_profiles[i].height &&
codec->pix_fmt == dv_profiles[i].pix_fmt && codec->pix_fmt == dv_profiles[i].pix_fmt &&
codec->width == dv_profiles[i].width) codec->coded_width == dv_profiles[i].width)
return &dv_profiles[i]; return &dv_profiles[i];
return NULL; return NULL;

6
libavformat/dv.c
View File

@ -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, avpriv_set_pts_info(c->vst, 64, c->sys->time_base.num,
c->sys->time_base.den); c->sys->time_base.den);
avctx->time_base= c->sys->time_base; avctx->time_base= c->sys->time_base;
if (!avctx->width){ if (!avctx->width)
avctx->width = c->sys->width; avcodec_set_dimensions(avctx, c->sys->width, c->sys->height);
avctx->height = c->sys->height;
}
avctx->pix_fmt = c->sys->pix_fmt; avctx->pix_fmt = c->sys->pix_fmt;
/* finding out SAR is a little bit messy */ /* finding out SAR is a little bit messy */