producer_avformat.c: inadvertantly left something commented in the previous commit.
authorddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Sat, 8 Nov 2008 07:21:29 +0000 (07:21 +0000)
committerddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Sat, 8 Nov 2008 07:21:29 +0000 (07:21 +0000)
git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1226 d19143bc-622f-0410-bfdd-b5b2a6649095

src/modules/avformat/producer_avformat.c

index 7f294bb..70fc572 100644 (file)
@@ -167,11 +167,11 @@ static double get_aspect_ratio( AVStream *stream, AVCodecContext *codec_context
        if ( codec_context->codec_id == CODEC_ID_DVVIDEO )
        {
                AVRational ar =
-// #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0)
-//                     stream->sample_aspect_ratio;
-// #else
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0)
+                       stream->sample_aspect_ratio;
+#else
                        codec_context->sample_aspect_ratio;
-// #endif
+#endif
                // Override FFmpeg's notion of DV aspect ratios, which are
                // based upon a width of 704. Since we do not have a normaliser
                // that crops (nor is cropping 720 wide ITU-R 601 video always desirable)