avformat/configure: update the recommended ffmpeg revision

[melted] / src / modules / avformat / consumer_avformat.c

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index 3dd40dc..87e3f5f 100644 (file)
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -315,7 +315,9 @@ static void apply_properties( void *obj, mlt_properties properties, int flags )
                const char *opt_name = mlt_properties_get_name( properties, i );
                const AVOption *opt = av_find_opt( obj, opt_name, NULL, flags, flags );
                if ( opt != NULL )
-#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(59<<8)+0)
+#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(7<<8)+0)
+                       av_set_string3( obj, opt_name, mlt_properties_get( properties, opt_name), 0, NULL );
+#elif LIBAVCODEC_VERSION_INT >= ((51<<16)+(59<<8)+0)
                        av_set_string2( obj, opt_name, mlt_properties_get( properties, opt_name), 0 );
 #else
                        av_set_string( obj, opt_name, mlt_properties_get( properties, opt_name) );
@@ -502,7 +504,7 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
                        }
                        else if ( ar == 16.0/15.0 ) // 4:3 PAL
                        {
-                               c->sample_aspect_ratio.num = 159;
+                               c->sample_aspect_ratio.num = 59;
                                c->sample_aspect_ratio.den = 54;
                        }
                        else if ( ar == 32.0/27.0 ) // 16:9 NTSC
@@ -513,7 +515,7 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
                        else // 16:9 PAL
                        {
                                c->sample_aspect_ratio.num = 118;
-                               c->sample_aspect_ratio.den = 81;
+                               c->sample_aspect_ratio.den = 82;
                        }
                }
                else if ( mlt_properties_get( properties, "aspect" ) )