har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

movenc: Factorize writing ftyp and other identification tags to a separate function

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2014-12-18 23:52:42 +02:00
parent 8d54bacb78
commit 355d01a1bf
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavformat/movenc.c
View File

@ -2988,6 +2988,20 @@ static void mov_write_uuidprof_tag(AVIOContext *pb, AVFormatContext *s)
avio_wb32(pb, 0x010001); /* ? */ avio_wb32(pb, 0x010001); /* ? */
} }
static int mov_write_identification(AVIOContext *pb, AVFormatContext *s)
{
MOVMuxContext *mov = s->priv_data;
mov_write_ftyp_tag(pb,s);
if (mov->mode == MODE_PSP) {
if (s->nb_streams != 2) {
av_log(s, AV_LOG_ERROR, "PSP mode need one video and one audio stream\n");
return AVERROR(EINVAL);
}
mov_write_uuidprof_tag(pb, s);
}
return 0;
}
static int mov_parse_mpeg2_frame(AVPacket *pkt, uint32_t *flags) static int mov_parse_mpeg2_frame(AVPacket *pkt, uint32_t *flags)
{ {
uint32_t c = -1; uint32_t c = -1;
@ -3605,7 +3619,7 @@ static int mov_write_header(AVFormatContext *s)
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
MOVMuxContext *mov = s->priv_data; MOVMuxContext *mov = s->priv_data;
AVDictionaryEntry *t; AVDictionaryEntry *t;
int i, hint_track = 0; int i, ret, hint_track = 0;
mov->fc = s; mov->fc = s;
@ -3664,14 +3678,8 @@ static int mov_write_header(AVFormatContext *s)
} }
mov_write_ftyp_tag(pb,s); if ((ret = mov_write_identification(pb, s)) < 0)
if (mov->mode == MODE_PSP) { return ret;
if (s->nb_streams != 2) {
av_log(s, AV_LOG_ERROR, "PSP mode need one video and one audio stream\n");
return AVERROR(EINVAL);
}
mov_write_uuidprof_tag(pb, s);
}
mov->nb_streams = s->nb_streams; mov->nb_streams = s->nb_streams;
if (mov->mode & (MODE_MP4|MODE_MOV|MODE_IPOD) && s->nb_chapters) if (mov->mode & (MODE_MP4|MODE_MOV|MODE_IPOD) && s->nb_chapters)