[FFmpeg-cvslog] dv: Correctly identify CDVC profile

Michael Niedermayer git at videolan.org
Wed Feb 27 17:29:20 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 27 17:19:51 2013 +0100| [5c924c9b7d6d2cdd890a35f0c236fa2cfc35d66c] | committer: Michael Niedermayer

dv: Correctly identify CDVC profile

Fixes Ticket2177

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c924c9b7d6d2cdd890a35f0c236fa2cfc35d66c
---

 libavcodec/dv_profile.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/dv_profile.c b/libavcodec/dv_profile.c
index 05d4aba..a1d9881 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++)



More information about the ffmpeg-cvslog mailing list