]> git.sesse.net Git - mlt/commitdiff
Fix regression on avdevice.
authorDan Dennedy <dan@dennedy.org>
Wed, 22 Jun 2011 04:34:28 +0000 (21:34 -0700)
committerDan Dennedy <dan@dennedy.org>
Wed, 22 Jun 2011 04:34:28 +0000 (21:34 -0700)
When using non-integer profile frame rate, supplying frame_rate on URL,
and not supplying frame_rate_base on URL.

src/modules/avformat/producer_avformat.c

index f14ce187817025831acfcd4403f005e9b74e1bc1..204f2755a1c7fd646d924d4394ee39ea496435a9 100644 (file)
@@ -572,7 +572,8 @@ static char* parse_url( mlt_profile profile, const char* URL, AVInputFormat **fo
                        // These are required by video4linux2 (defaults)
                        params->width = profile->width;
                        params->height = profile->height;
-                       params->time_base= (AVRational){ profile->frame_rate_den, profile->frame_rate_num };
+                       if ( !strstr( URL, "&frame_rate" ) )
+                               params->time_base = (AVRational){ profile->frame_rate_den, profile->frame_rate_num };
                        params->channels = 2;
                        params->sample_rate = 48000;