virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/movenc: Drop redundant bit exact field from context

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2015-07-18 13:17:21 +02:00
parent 3197c0aa87
commit a194298954
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/movenc.c
View File

@@ -3116,7 +3116,6 @@ static void mov_write_psp_udta_tag(AVIOContext *pb,
static int mov_write_uuidusmt_tag(AVIOContext *pb, AVFormatContext *s) 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); AVDictionaryEntry *title = av_dict_get(s->metadata, "title", NULL, 0);
int64_t pos, pos2; 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, 0x0); /* ? */
avio_wb16(pb, 0x021C); /* data */ 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, LIBAVCODEC_IDENT, "eng", 0x04);
mov_write_psp_udta_tag(pb, title->value, "eng", 0x01); mov_write_psp_udta_tag(pb, title->value, "eng", 0x01);
mov_write_psp_udta_tag(pb, "2006/04/01 11:11:11", "und", 0x03); 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, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
avio_printf(pb, "<smil xmlns=\"http://www.w3.org/2001/SMIL20/Language\">\n"); avio_printf(pb, "<smil xmlns=\"http://www.w3.org/2001/SMIL20/Language\">\n");
avio_printf(pb, "<head>\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", avio_printf(pb, "<meta name=\"creator\" content=\"%s\" />\n",
LIBAVFORMAT_IDENT); LIBAVFORMAT_IDENT);
avio_printf(pb, "</head>\n"); 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; 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) if (mov->flags & FF_MOV_FLAG_DELAY_MOOV)
mov->flags |= FF_MOV_FLAG_EMPTY_MOOV; mov->flags |= FF_MOV_FLAG_EMPTY_MOOV;

1
libavformat/movenc.h
View File

@@ -164,7 +164,6 @@ typedef struct MOVMuxContext {
int flags; int flags;
int rtp_flags; int rtp_flags;
int exact;
int iods_skip; int iods_skip;
int iods_video_profile; int iods_video_profile;