]> git.sesse.net Git - mlt/commitdiff
Restrict auto-profile frame rate to a sane value.
authorDan Dennedy <dan@dennedy.org>
Thu, 3 Apr 2014 06:05:10 +0000 (23:05 -0700)
committerDan Dennedy <dan@dennedy.org>
Thu, 3 Apr 2014 06:12:16 +0000 (23:12 -0700)
MP3 and M4A album art have 90000 fps through libavcodec!

src/framework/mlt_profile.c

index d23cd4b89d4cfa357b0402c9861aa9c9a88cbdba..4385d7a789be5bf857c1d0b05f170256dce057f0 100644 (file)
@@ -424,8 +424,15 @@ void mlt_profile_from_producer( mlt_profile profile, mlt_producer producer )
                                profile->width = mlt_properties_get_int( p, "meta.media.width" );
                                profile->height = mlt_properties_get_int( p, "meta.media.height" );
                                profile->progressive = mlt_properties_get_int( p, "meta.media.progressive" );
-                               profile->frame_rate_num = mlt_properties_get_int( p, "meta.media.frame_rate_num" );
-                               profile->frame_rate_den = mlt_properties_get_int( p, "meta.media.frame_rate_den" );
+                               if ( 1000 > mlt_properties_get_double( p, "meta.media.frame_rate_num" )
+                                         / mlt_properties_get_double( p, "meta.media.frame_rate_den" ) )
+                               {
+                                       profile->frame_rate_num = mlt_properties_get_int( p, "meta.media.frame_rate_num" );
+                                       profile->frame_rate_den = mlt_properties_get_int( p, "meta.media.frame_rate_den" );
+                               } else {
+                                       profile->frame_rate_num = 60;
+                                       profile->frame_rate_den = 1;
+                               }
                                // AVCHD is mis-reported as double frame rate.
                                if ( profile->progressive == 0 && (
                                     profile->frame_rate_num / profile->frame_rate_den == 50 ||