diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 16:57:24 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 16:57:24 +0000 |
| commit | 257766a838c5359558a7745d39d570d78eeecd76 (patch) | |
| tree | 806dec31d080b01328f6418350214ebe6b066b19 /libavformat/movenc-test.c | |
| parent | 895b888f1606eb734c9ad16862c205a260cf622c (diff) | |
| parent | 9cce011b1d2f66366f5d75a024c2a2f93dc2b589 (diff) | |
Merge commit '9cce011b1d2f66366f5d75a024c2a2f93dc2b589'
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/movenc-test.c')
| -rw-r--r-- | libavformat/movenc-test.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/movenc-test.c b/libavformat/movenc-test.c index cba6762b77..8c69c767a7 100644 --- a/libavformat/movenc-test.c +++ b/libavformat/movenc-test.c @@ -170,7 +170,6 @@ static void init_fps(int bf, int audio_preroll, int fps) if (!st->codec->extradata) exit(1); memcpy(st->codec->extradata, h264_extradata, sizeof(h264_extradata)); - st->codec->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; video_st = st; 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) exit(1); memcpy(st->codec->extradata, aac_extradata, sizeof(aac_extradata)); - st->codec->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; audio_st = st; if (avformat_write_header(ctx, &opts) < 0) |