浏览代码

obs-ffmpeg: Use new ffmpeg constants

Richard Stanway 8 年之前
父节点
当前提交
95f20c84ba

+ 2 - 2
plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c

@@ -312,7 +312,7 @@ static void create_video_stream(struct ffmpeg_mux *ffm)
 	ffm->video_stream->time_base = context->time_base;
 
 	if (ffm->output->oformat->flags & AVFMT_GLOBALHEADER)
-		context->flags |= CODEC_FLAG_GLOBAL_HEADER;
+		context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
 }
 
 static void create_audio_stream(struct ffmpeg_mux *ffm, int idx)
@@ -348,7 +348,7 @@ static void create_audio_stream(struct ffmpeg_mux *ffm, int idx)
 			av_get_default_channel_layout(context->channels);
 
 	if (ffm->output->oformat->flags & AVFMT_GLOBALHEADER)
-		context->flags |= CODEC_FLAG_GLOBAL_HEADER;
+		context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
 
 	ffm->num_audio_streams++;
 }

+ 1 - 1
plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c

@@ -214,7 +214,7 @@ static void *enc_create(obs_data_t *settings, obs_encoder_t *encoder,
 	/* enable experimental FFmpeg encoder if the only one available */
 	enc->context->strict_std_compliance = -2;
 
-	enc->context->flags = CODEC_FLAG_GLOBAL_HEADER;
+	enc->context->flags = AV_CODEC_FLAG_GLOBAL_HEADER;
 
 	if (initialize_codec(enc))
 		return enc;

+ 2 - 2
plugins/obs-ffmpeg/obs-ffmpeg-output.c

@@ -260,7 +260,7 @@ static bool create_video_stream(struct ffmpeg_data *data)
 	data->video->time_base = context->time_base;
 
 	if (data->output->oformat->flags & AVFMT_GLOBALHEADER)
-		context->flags |= CODEC_FLAG_GLOBAL_HEADER;
+		context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
 
 	if (!open_video_codec(data))
 		return false;
@@ -348,7 +348,7 @@ static bool create_audio_stream(struct ffmpeg_data *data)
 	data->audio_size = get_audio_size(data->audio_format, aoi.speakers, 1);
 
 	if (data->output->oformat->flags & AVFMT_GLOBALHEADER)
-		context->flags |= CODEC_FLAG_GLOBAL_HEADER;
+		context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
 
 	return open_audio_codec(data);
 }