]> git.sesse.net Git - mlt/commitdiff
Revert "make speed of editing AVCHD tolerable"
authorDan Dennedy <dan@dennedy.org>
Thu, 31 May 2012 05:12:59 +0000 (22:12 -0700)
committerDan Dennedy <dan@dennedy.org>
Fri, 1 Jun 2012 19:03:46 +0000 (12:03 -0700)
This reverts commit b17e3e9f4eadc0dc53ded8a14df2059bb642afb1.

src/modules/avformat/producer_avformat.c

index 455de31c9dbd7a840364fd5425d613ff0e1cd92d..56cc702734d61cdcc02c97aaa50c9650904f8013 100644 (file)
@@ -1480,13 +1480,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        double delay = mlt_properties_get_double( properties, "video_delay" );
 
        // Seek if necessary
-       const char *interp = mlt_properties_get( frame_properties, "rescale.interp" );
-       int preseek = must_decode
-#if defined(FFUDIV) && LIBAVFORMAT_VERSION_INT >= ((53<<16)+(24<<8)+2)
-               && ( !use_new_seek || ( interp && strcmp( interp, "nearest" ) ) )
-#endif
-               && codec_context->has_b_frames;
-       int paused = seek_video( self, position, req_position, preseek, use_new_seek, &ignore );
+       int paused = seek_video( self, position, req_position, must_decode, use_new_seek, &ignore );
 
        // Seek might have reopened the file
        context = self->video_format;