aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2012-03-06 21:36:58 +0100
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2012-03-10 10:45:03 +0100
commit8fbf825ecc3241998cc3e828dbf1c9eddd4ab356 (patch)
treef5bd9bacfc1a4b090e20146b5a77b528cabf5102
parentb52bd2a4ab99223eee39f0100a1395e3c98a09ad (diff)
downloadffmpeg-8fbf825ecc3241998cc3e828dbf1c9eddd4ab356.tar.gz
DV: Use profile[1] detection hack only for stype 0.
The two samples both have stype 0. Without this extra check, the code breaks 4:2:2 dvsd (stype 4), since that has the same resolution. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
-rw-r--r--libavcodec/dvdata.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dvdata.c b/libavcodec/dvdata.c
index 4d08d427f9..8c06be7c97 100644
--- a/libavcodec/dvdata.c
+++ b/libavcodec/dvdata.c
@@ -300,7 +300,7 @@ const DVprofile* avpriv_dv_frame_profile2(AVCodecContext* codec, const DVprofile
return &dv_profiles[2];
}
- if(codec && codec->codec_tag==AV_RL32("dvsd") && codec->width==720 && codec->height==576)
+ if(stype == 0 && codec && codec->codec_tag==AV_RL32("dvsd") && codec->width==720 && codec->height==576)
return &dv_profiles[1];
for (i = 0; i < FF_ARRAY_ELEMS(dv_profiles); i++)