Skip to content
Snippets Groups Projects
Commit 257766a8 authored by Derek Buitenhuis's avatar Derek Buitenhuis
Browse files

Merge commit '9cce011b' 


Merged-by: default avatarDerek Buitenhuis <derek.buitenhuis@gmail.com>
parents 895b888f 9cce011b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
libavformat/movenc-test.c
+ 0
− 2
View file @ 257766a8
...@@ -170,7 +170,6 @@ static void init_fps(int bf, int audio_preroll, int fps) ...@@ -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) ...@@ -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)
......
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