generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

movenc: add some default cases.

Browse Source 
This fixes crashes when copying a data track as in trac
issue #236.
No proper timecode tracks will be written though.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2012-03-24 21:36:51 +01:00
parent 50059bde77
commit 40393ac568
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/movenc.c
View File

@ -1316,6 +1316,10 @@ static int mov_write_hdlr_tag(AVIOContext *pb, MOVTrack *track)
} else if (track->enc->codec_tag == MKTAG('r','t','p',' ')) { } else if (track->enc->codec_tag == MKTAG('r','t','p',' ')) {
hdlr_type = "hint"; hdlr_type = "hint";
descr = "HintHandler"; descr = "HintHandler";
} else {
hdlr = "dhlr";
hdlr_type = "url ";
descr = "DataHandler";
} }
} }
@ -3207,6 +3211,8 @@ static int mov_write_header(AVFormatContext *s)
} }
}else if(st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE){ }else if(st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE){
track->timescale = st->codec->time_base.den; track->timescale = st->codec->time_base.den;
}else{
track->timescale = MOV_TIMESCALE;
} }
if (!track->height) if (!track->height)
track->height = st->codec->height; track->height = st->codec->height;