[FFmpeg-cvslog] DV: Use profile[1] detection hack only for stype 0.

Reimar Döffinger git at videolan.org
Sat Mar 10 10:45:33 CET 2012


ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Tue Mar  6 21:36:58 2012 +0100| [8fbf825ecc3241998cc3e828dbf1c9eddd4ab356] | committer: Reimar Döffinger

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 at gmx.de>

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

 libavcodec/dvdata.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/dvdata.c b/libavcodec/dvdata.c
index 4d08d42..8c06be7 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++)



More information about the ffmpeg-cvslog mailing list