Try again with ffmpeg build fix as the upstream fix looks bad

el8
leigh123linux 7 years ago
parent 66ad3a8cca
commit 5666093c6e

@ -1,16 +1,15 @@
--- a/applications/dashcast/video_encoder.c --- a/applications/dashcast/video_encoder.c
+++ b/applications/dashcast/video_encoder.c +++ b/applications/dashcast/video_encoder.c
@@ -143,8 +143,10 @@ int dc_video_encoder_open(VideoOutputFile *video_output_file, VideoDataConf *vid @@ -144,7 +144,7 @@
av_opt_set_int(video_output_file->codec_ctx->priv_data, "key-int", video_output_file->gdr, 0);
} }
+#ifdef CODEC_FLAG_GLOBAL_HEADER
//the global header gives access to the extradata (SPS/PPS) //the global header gives access to the extradata (SPS/PPS)
video_output_file->codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER; - video_output_file->codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+#endif + video_output_file->codec_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
video_output_file->vstream_idx = 0;//video_stream->index; video_output_file->vstream_idx = 0;//video_stream->index;
--- a/modules/ffmpeg_in/ffmpeg_decode.c --- a/modules/ffmpeg_in/ffmpeg_decode.c
+++ b/modules/ffmpeg_in/ffmpeg_decode.c +++ b/modules/ffmpeg_in/ffmpeg_decode.c
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@

Loading…
Cancel
Save