if ( st != NULL )
{
char *pix_fmt = mlt_properties_get( properties, "pix_fmt" );
- double ar = mlt_properties_get_double( properties, "aspect_ratio" );
AVCodecContext *c = st->codec;
// Establish defaults from AVOptions
// we just coerce the values to facilitate a passive behaviour through
// the rescale normaliser when using equivalent producers and consumers.
// = display_aspect / (width * height)
+ double ar = mlt_properties_get_double( properties, "aspect_ratio" );
if ( ar == 8.0/9.0 ) // 4:3 NTSC
{
c->sample_aspect_ratio.num = 10;
c->sample_aspect_ratio.den = 81;
}
}
- else
+ 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);
}
+ 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 ( mlt_properties_get_double( properties, "qscale" ) > 0 )
{
// Check for audio codec overides
if ( acodec != NULL )
{
- AVCodec *p = first_avcodec;
- while( p != NULL )
- {
- if ( !strcmp( p->name, acodec ) && p->type == CODEC_TYPE_AUDIO )
- break;
- p = p->next;
- }
+ AVCodec *p = avcodec_find_encoder_by_name( acodec );
if ( p != NULL )
audio_codec_id = p->id;
else
// Check for video codec overides
if ( vcodec != NULL )
{
- AVCodec *p = first_avcodec;
- while( p != NULL )
- {
- if ( !strcmp( p->name, vcodec ) && p->type == CODEC_TYPE_VIDEO )
- break;
- p = p->next;
- }
+ AVCodec *p = avcodec_find_encoder_by_name( vcodec );
if ( p != NULL )
video_codec_id = p->id;
else