]> git.sesse.net Git - mlt/commitdiff
remove deprecated source_fps property
authorDan Dennedy <dan@dennedy.org>
Mon, 5 Mar 2012 05:23:32 +0000 (21:23 -0800)
committerDan Dennedy <dan@dennedy.org>
Mon, 5 Mar 2012 07:08:07 +0000 (23:08 -0800)
src/modules/avformat/producer_avformat.c
src/modules/dv/producer_libdv.c

index 208e8406e3c5491d397b03e49811119bfa87921d..04b1ab6aa13bc7096a79448630982f5449c30b39 100644 (file)
@@ -1985,7 +1985,6 @@ static int video_codec_init( producer_avformat self, int index, mlt_properties p
 #endif
                                mlt_properties_set_int( properties, "meta.media.frame_rate_num", frame_rate.num );
                                mlt_properties_set_int( properties, "meta.media.frame_rate_den", frame_rate.den );
-                               source_fps = av_q2d( frame_rate );
                        }
                        else
                        {
@@ -1996,12 +1995,6 @@ static int video_codec_init( producer_avformat self, int index, mlt_properties p
                        }
                }
 
-               // source_fps is deprecated in favor of meta.media.frame_rate_num and .frame_rate_den
-               if ( source_fps > 0 )
-                       mlt_properties_set_double( properties, "source_fps", source_fps );
-               else
-                       mlt_properties_set_double( properties, "source_fps", mlt_producer_get_fps( self->parent ) );
-
                // Set the YUV colorspace from override or detect
                self->colorspace = mlt_properties_get_int( properties, "force_colorspace" );
 #if LIBAVCODEC_VERSION_INT > ((52<<16)+(28<<8)+0)              
index c461aaa0c7e0f03913433dd43962aef2d526f9d0..cef5ef3c6d4735b4a62664e6c22696ed1cb5f743 100644 (file)
@@ -279,7 +279,6 @@ static int producer_collect_info( producer_libdv this, mlt_profile profile )
                                        aspect_ratio = 8 / 9;
                        }
                        mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio);
-                       mlt_properties_set_double( properties, "source_fps", this->is_pal ? 25 : ( 30000.0 / 1001.0 ) );
                        mlt_properties_set_int( properties, "meta.media.nb_streams", 2 );
                        mlt_properties_set_int( properties, "video_index", 0 );
                        mlt_properties_set( properties, "meta.media.0.stream.type", "video" );
@@ -291,6 +290,8 @@ static int producer_collect_info( producer_libdv this, mlt_profile profile )
                        mlt_properties_set( properties, "meta.media.1.codec.long_name", "signed 16-bit little-endian PCM" );
                        mlt_properties_set_int( properties, "meta.media.width", 720 );
                        mlt_properties_set_int( properties, "meta.media.height", this->is_pal ? 576 : 480 );
+                       mlt_properties_set_int( properties, "meta.media.frame_rate_num", this->is_pal? 25 : 30000 );
+                       mlt_properties_set_int( properties, "meta.media.frame_rate_den", this->is_pal?  1 :  1001 );
 
                        // Return the decoder
                        dv_decoder_return( dv_decoder );