diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-18 13:17:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-18 13:27:33 +0200 |
| commit | a194298954e98d915790ef4f7f277f50762be1ad (patch) | |
| tree | 5b1d20ed307d395cfa50df5fdd280d2eb9fde652 /libavformat/movenc.c | |
| parent | 3197c0aa87a3b7190e17d49e6fbc7b554e4b3f0a (diff) | |
| download | ffmpeg-a194298954e98d915790ef4f7f277f50762be1ad.tar.gz | |
avformat/movenc: Drop redundant bit exact field from context
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 77905eb0f7..8b7e582768 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3116,7 +3116,6 @@ static void mov_write_psp_udta_tag(AVIOContext *pb, static int mov_write_uuidusmt_tag(AVIOContext *pb, AVFormatContext *s) { - MOVMuxContext *mov = s->priv_data; AVDictionaryEntry *title = av_dict_get(s->metadata, "title", NULL, 0); int64_t pos, pos2; @@ -3141,7 +3140,7 @@ static int mov_write_uuidusmt_tag(AVIOContext *pb, AVFormatContext *s) avio_wb16(pb, 0x0); /* ? */ avio_wb16(pb, 0x021C); /* data */ - if (!mov->exact) + if (!(s->flags & AVFMT_FLAG_BITEXACT)) mov_write_psp_udta_tag(pb, LIBAVCODEC_IDENT, "eng", 0x04); mov_write_psp_udta_tag(pb, title->value, "eng", 0x01); mov_write_psp_udta_tag(pb, "2006/04/01 11:11:11", "und", 0x03); @@ -3276,7 +3275,7 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov) avio_printf(pb, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"); avio_printf(pb, "<smil xmlns=\"http://www.w3.org/2001/SMIL20/Language\">\n"); avio_printf(pb, "<head>\n"); - if (!mov->exact) + if (!(mov->fc->flags & AVFMT_FLAG_BITEXACT)) avio_printf(pb, "<meta name=\"creator\" content=\"%s\" />\n", LIBAVFORMAT_IDENT); avio_printf(pb, "</head>\n"); @@ -4961,9 +4960,6 @@ static int mov_write_header(AVFormatContext *s) else if (!strcmp("f4v", s->oformat->name)) mov->mode = MODE_F4V; } - if (s->flags & AVFMT_FLAG_BITEXACT) - mov->exact = 1; - if (mov->flags & FF_MOV_FLAG_DELAY_MOOV) mov->flags |= FF_MOV_FLAG_EMPTY_MOOV; |