mirror of https://git.ffmpeg.org/ffmpeg.git
mov: fill in subtitle dimensions after parsing tkhd
Sample-Id: NeroRecodeSample.mp4
This commit is contained in:
parent
96138e8c8d
commit
fce28c3c6d
|
@ -2857,6 +2857,7 @@ static int mov_read_header(AVFormatContext *s)
|
||||||
AVIOContext *pb = s->pb;
|
AVIOContext *pb = s->pb;
|
||||||
int err;
|
int err;
|
||||||
MOVAtom atom = { AV_RL32("root") };
|
MOVAtom atom = { AV_RL32("root") };
|
||||||
|
int i;
|
||||||
|
|
||||||
mov->fc = s;
|
mov->fc = s;
|
||||||
/* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */
|
/* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */
|
||||||
|
@ -2881,8 +2882,19 @@ static int mov_read_header(AVFormatContext *s)
|
||||||
if (pb->seekable && mov->chapter_track > 0)
|
if (pb->seekable && mov->chapter_track > 0)
|
||||||
mov_read_chapters(s);
|
mov_read_chapters(s);
|
||||||
|
|
||||||
|
for (i = 0; i < s->nb_streams; i++) {
|
||||||
|
AVStream *st = s->streams[i];
|
||||||
|
MOVStreamContext *sc = st->priv_data;
|
||||||
|
|
||||||
|
if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
|
||||||
|
if (st->codec->width <= 0 && st->codec->width <= 0) {
|
||||||
|
st->codec->width = sc->width;
|
||||||
|
st->codec->height = sc->height;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (mov->trex_data) {
|
if (mov->trex_data) {
|
||||||
int i;
|
|
||||||
for (i = 0; i < s->nb_streams; i++) {
|
for (i = 0; i < s->nb_streams; i++) {
|
||||||
AVStream *st = s->streams[i];
|
AVStream *st = s->streams[i];
|
||||||
MOVStreamContext *sc = st->priv_data;
|
MOVStreamContext *sc = st->priv_data;
|
||||||
|
|
Loading…
Reference in New Issue