mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '9cce011b1d2f66366f5d75a024c2a2f93dc2b589'
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
commit
257766a838
|
@ -170,7 +170,6 @@ static void init_fps(int bf, int audio_preroll, int fps)
|
||||||
if (!st->codec->extradata)
|
if (!st->codec->extradata)
|
||||||
exit(1);
|
exit(1);
|
||||||
memcpy(st->codec->extradata, h264_extradata, sizeof(h264_extradata));
|
memcpy(st->codec->extradata, h264_extradata, sizeof(h264_extradata));
|
||||||
st->codec->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
|
|
||||||
video_st = st;
|
video_st = st;
|
||||||
|
|
||||||
st = avformat_new_stream(ctx, NULL);
|
st = avformat_new_stream(ctx, NULL);
|
||||||
|
@ -187,7 +186,6 @@ static void init_fps(int bf, int audio_preroll, int fps)
|
||||||
if (!st->codec->extradata)
|
if (!st->codec->extradata)
|
||||||
exit(1);
|
exit(1);
|
||||||
memcpy(st->codec->extradata, aac_extradata, sizeof(aac_extradata));
|
memcpy(st->codec->extradata, aac_extradata, sizeof(aac_extradata));
|
||||||
st->codec->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
|
|
||||||
audio_st = st;
|
audio_st = st;
|
||||||
|
|
||||||
if (avformat_write_header(ctx, &opts) < 0)
|
if (avformat_write_header(ctx, &opts) < 0)
|
||||||
|
|
Loading…
Reference in New Issue