@@ -490,41 +490,41 @@ static mlt_properties find_default_streams(producer_avformat self)
490490 // Allow for multiple audio and video streams in the file and select first of each (if available)
491491 for (i = 0 ; i < context -> nb_streams ; i ++ ) {
492492 // Get the codec context
493- AVFormatContext * vpxContext = NULL ;
493+ AVFormatContext * vpx_context = NULL ;
494494 AVStream * stream = context -> streams [i ];
495495 if (!stream )
496496 continue ;
497497 AVCodecParameters * codec_params = stream -> codecpar ;
498498 const AVCodec * codec = avcodec_find_decoder (codec_params -> codec_id );
499499 if (!codec )
500500 continue ;
501- int switchToVpxCodec = 0 ;
501+ int switch_to_vpx = 0 ;
502502 if (codec_params -> codec_id == AV_CODEC_ID_VP9 ) {
503503 if (!(codec = avcodec_find_decoder_by_name ("libvpx-vp9" ))) {
504504 codec = avcodec_find_decoder (codec_params -> codec_id );
505505 } else {
506- switchToVpxCodec = 1 ;
506+ switch_to_vpx = 1 ;
507507 }
508508 } else if (codec_params -> codec_id == AV_CODEC_ID_VP8 ) {
509509 if (!(codec = avcodec_find_decoder_by_name ("libvpx" ))) {
510510 codec = avcodec_find_decoder (codec_params -> codec_id );
511511 } else {
512- switchToVpxCodec = 1 ;
512+ switch_to_vpx = 1 ;
513513 }
514514 }
515- if (switchToVpxCodec ) {
515+ if (switch_to_vpx ) {
516516 // Use a temporary format context to get the real pixel format with the libvpx decoder,
517517 // since the native decoder incorreclty detects yuva420p as yuv420p
518- int error = avformat_open_input (& vpxContext ,
518+ int error = avformat_open_input (& vpx_context ,
519519 mlt_properties_get (meta_media , "resource" ),
520520 NULL ,
521521 NULL );
522522 if (!error ) {
523- vpxContext -> video_codec = codec ;
524- avformat_find_stream_info (vpxContext , NULL );
525- AVStream * vpxStream = vpxContext -> streams [i ];
526- if (vpxStream ) {
527- codec_params = vpxStream -> codecpar ;
523+ vpx_context -> video_codec = codec ;
524+ avformat_find_stream_info (vpx_context , NULL );
525+ AVStream * vpx_stream = vpx_context -> streams [i ];
526+ if (vpx_stream ) {
527+ codec_params = vpx_stream -> codecpar ;
528528 }
529529 }
530530 }
@@ -665,9 +665,9 @@ static mlt_properties find_default_streams(producer_avformat self)
665665 free (value );
666666 }
667667 }
668- if (vpxContext ) {
669- avformat_close_input (& vpxContext );
670- vpxContext = NULL ;
668+ if (vpx_context ) {
669+ avformat_close_input (& vpx_context );
670+ vpx_context = NULL ;
671671 }
672672 }
673673
0 commit comments