Skip to content

V
vlc-gpu
Commit 08fefcb7 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/stream_out/transcode.c: fix for when forcing encoder.

parent 75013fc5
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
modules/stream_out/transcode.c
View file @ 08fefcb7
...@@ -860,6 +860,7 @@ static int transcode_audio_ffmpeg_new( sout_stream_t *p_stream, ...@@ -860,6 +860,7 @@ static int transcode_audio_ffmpeg_new( sout_stream_t *p_stream,
id->f_dst.audio.i_rate = id->p_encoder->fmt_in.audio.i_rate; id->f_dst.audio.i_rate = id->p_encoder->fmt_in.audio.i_rate;
id->f_dst.i_extra = id->p_encoder->fmt_out.i_extra; id->f_dst.i_extra = id->p_encoder->fmt_out.i_extra;
id->f_dst.p_extra = id->p_encoder->fmt_out.p_extra; id->f_dst.p_extra = id->p_encoder->fmt_out.p_extra;
id->f_dst.i_codec = id->p_encoder->fmt_out.i_codec;
/* Hack for mp3 transcoding support */ /* Hack for mp3 transcoding support */
if( id->f_dst.i_codec == VLC_FOURCC( 'm','p','3',' ' ) ) if( id->f_dst.i_codec == VLC_FOURCC( 'm','p','3',' ' ) )
...@@ -1534,6 +1535,7 @@ static int transcode_video_ffmpeg_process( sout_stream_t *p_stream, ...@@ -1534,6 +1535,7 @@ static int transcode_video_ffmpeg_process( sout_stream_t *p_stream,
id->f_dst.i_extra = id->p_encoder->fmt_out.i_extra; id->f_dst.i_extra = id->p_encoder->fmt_out.i_extra;
id->f_dst.p_extra = id->p_encoder->fmt_out.p_extra; id->f_dst.p_extra = id->p_encoder->fmt_out.p_extra;
id->f_dst.i_codec = id->p_encoder->fmt_out.i_codec;
/* Hack for mp2v/mp1v transcoding support */ /* Hack for mp2v/mp1v transcoding support */
if( id->f_dst.i_codec == VLC_FOURCC( 'm','p','1','v' ) || if( id->f_dst.i_codec == VLC_FOURCC( 'm','p','1','v' ) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment