summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-27 17:19:51 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-27 17:19:51 +0100
commit5c924c9b7d6d2cdd890a35f0c236fa2cfc35d66c (patch)
treed15aff5ac6997453ce22ee5a6d754fb28815c5aa /libavcodec
parent21c2e201f6aa70fe8fdd1b3d87362f16220f4594 (diff)
dv: Correctly identify CDVC profile
Fixes Ticket2177 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/dv_profile.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/dv_profile.c b/libavcodec/dv_profile.c
index 05d4abae16..a1d98818c4 100644
--- a/libavcodec/dv_profile.c
+++ b/libavcodec/dv_profile.c
@@ -298,7 +298,11 @@ const DVprofile* avpriv_dv_frame_profile2(AVCodecContext* codec, const DVprofile
return &dv_profiles[2];
}
- if(stype == 0 && codec && codec->codec_tag==AV_RL32("dvsd") && codec->coded_width==720 && codec->coded_height==576)
+ if( stype == 0
+ && codec
+ && (codec->codec_tag==AV_RL32("dvsd") || codec->codec_tag==AV_RL32("CDVC"))
+ && codec->coded_width ==720
+ && codec->coded_height==576)
return &dv_profiles[1];
for (i = 0; i < FF_ARRAY_ELEMS(dv_profiles); i++)