From: Dan Dennedy Date: Fri, 3 Feb 2012 00:26:33 +0000 (-0800) Subject: fix getting sample_fmt name crashing on some versions X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=faf87db656cd54c4622df33f72aa96c69873f8cd;p=mlt fix getting sample_fmt name crashing on some versions when av_get_sample_fmt_name exists but not avcodec_get_sample_fmt_name --- diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c index 2492315e..c94080dd 100644 --- a/src/modules/avformat/producer_avformat.c +++ b/src/modules/avformat/producer_avformat.c @@ -365,7 +365,7 @@ static mlt_properties find_default_streams( producer_avformat self ) if ( self->audio_index < 0 ) self->audio_index = i; mlt_properties_set( meta_media, key, "audio" ); -#if LIBAVCODEC_VERSION_MAJOR >= 53 +#if LIBAVUTIL_VERSION_INT >= ((50<<16)+(38<<8)+0) snprintf( key, sizeof(key), "meta.media.%d.codec.sample_fmt", i ); mlt_properties_set( meta_media, key, av_get_sample_fmt_name( codec_context->sample_fmt ) ); #elif (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0))