aacdec: reset max_sfb on invalid data.

[ffmpeg] / libavcodec / dvdata.c

diff --git a/libavcodec/dvdata.c b/libavcodec/dvdata.c
index 8c06be7c97cb292f08773e44044791f086f98a39..9de1db527081917f422bd45e1d453e20d558eaf7 100644 (file)
--- a/libavcodec/dvdata.c
+++ b/libavcodec/dvdata.c
@@ -323,11 +323,20 @@ const DVprofile* avpriv_dv_frame_profile(const DVprofile *sys,
 const DVprofile* avpriv_dv_codec_profile(AVCodecContext* codec)
 {
     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++)
-       if (codec->coded_height == dv_profiles[i].height  &&
+       if (h == dv_profiles[i].height  &&
            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 NULL;