mirror of https://git.ffmpeg.org/ffmpeg.git
dv: Fix streamcopy input.
Fixes Ticket1042 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
50d67d951c
commit
2560d3b648
|
@ -323,11 +323,20 @@ const DVprofile* avpriv_dv_frame_profile(const DVprofile *sys,
|
||||||
const DVprofile* avpriv_dv_codec_profile(AVCodecContext* codec)
|
const DVprofile* avpriv_dv_codec_profile(AVCodecContext* codec)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
int w, h;
|
||||||
|
|
||||||
|
if (codec->coded_width || codec->coded_height) {
|
||||||
|
w = codec->coded_width;
|
||||||
|
h = codec->coded_height;
|
||||||
|
} else {
|
||||||
|
w = codec->width;
|
||||||
|
h = codec->height;
|
||||||
|
}
|
||||||
|
|
||||||
for (i=0; i<FF_ARRAY_ELEMS(dv_profiles); i++)
|
for (i=0; i<FF_ARRAY_ELEMS(dv_profiles); i++)
|
||||||
if (codec->coded_height == dv_profiles[i].height &&
|
if (h == dv_profiles[i].height &&
|
||||||
codec->pix_fmt == dv_profiles[i].pix_fmt &&
|
codec->pix_fmt == dv_profiles[i].pix_fmt &&
|
||||||
codec->coded_width == dv_profiles[i].width)
|
w == dv_profiles[i].width)
|
||||||
return &dv_profiles[i];
|
return &dv_profiles[i];
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
Loading…
Reference in New Issue