]> git.sesse.net Git - mlt/commitdiff
consumer_avformat.c: fix build on older libavformat versions
authorddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Tue, 21 Oct 2008 20:54:36 +0000 (20:54 +0000)
committerddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Tue, 21 Oct 2008 20:54:36 +0000 (20:54 +0000)
git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1189 d19143bc-622f-0410-bfdd-b5b2a6649095

src/modules/avformat/consumer_avformat.c

index 38c8e8da247d412da7a8283a1fb369263ec5a48e..0f2f1ddede911bf698c96a96ec9c7e9bffe56c99 100644 (file)
@@ -467,43 +467,55 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
                        {
                                c->sample_aspect_ratio.num = 10;
                                c->sample_aspect_ratio.den = 11;
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0)                    
                                st->sample_aspect_ratio.num = 10;
                                st->sample_aspect_ratio.den = 11;
+#endif
                        }
                        else if ( ar == 16.0/15.0 ) // 4:3 PAL
                        {
                                c->sample_aspect_ratio.num = 159;
                                c->sample_aspect_ratio.den = 54;
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0)                    
                                st->sample_aspect_ratio.num = 159;
                                st->sample_aspect_ratio.den = 54;
+#endif
                        }
                        else if ( ar == 32.0/27.0 ) // 16:9 NTSC
                        {
                                c->sample_aspect_ratio.num = 40;
                                c->sample_aspect_ratio.den = 33;
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0)                    
                                st->sample_aspect_ratio.num = 40;
                                st->sample_aspect_ratio.den = 33;
+#endif
                        }
                        else // 16:9 PAL
                        {
                                c->sample_aspect_ratio.num = 118;
                                c->sample_aspect_ratio.den = 81;
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0)                    
                                st->sample_aspect_ratio.num = 118;
                                st->sample_aspect_ratio.den = 81;
+#endif
                        }
                }
                else if ( mlt_properties_get( properties, "aspect" ) )
                {
                        double ar = mlt_properties_get_double( properties, "aspect" );
                        c->sample_aspect_ratio = av_d2q( ar * c->height / c->width , 255);
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0)                    
                        st->sample_aspect_ratio = av_d2q( ar * c->height / c->width , 255);
+#endif
                }
                else
                {
                        c->sample_aspect_ratio.num = mlt_properties_get_int( properties, "sample_aspect_num" );
                        c->sample_aspect_ratio.den = mlt_properties_get_int( properties, "sample_aspect_den" );
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0)                    
                        st->sample_aspect_ratio.num = mlt_properties_get_int( properties, "sample_aspect_num" );
                        st->sample_aspect_ratio.den = mlt_properties_get_int( properties, "sample_aspect_den" );
+#endif
                }
 
                if ( mlt_properties_get_double( properties, "qscale" ) > 0 )