diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-17 18:52:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-28 02:04:38 +0100 |
| commit | bfd586577cbe22f863d5620fa2a85f5f5bb3c9e1 (patch) | |
| tree | 1572fc42a9fec989e381fc04838e366c6a532406 | |
| parent | 5589549c1d9e3ebb8b355b2b17846c06e2a9f754 (diff) | |
| download | ffmpeg-bfd586577cbe22f863d5620fa2a85f5f5bb3c9e1.tar.gz | |
movenc: check that fps for tmcd is within encodable range.
The fps is stored as a 8 bit value thus 255 is the maximum encodable.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 55d66b27902d3f566cd6cf6f08d4233dcdc338f5)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/movenc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index d9b002e0b5..1b851c03dd 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1149,6 +1149,11 @@ static int mov_write_tmcd_tag(AVIOContext *pb, MOVTrack *track) int frame_duration = av_rescale(track->timescale, track->enc->time_base.num, track->enc->time_base.den); int nb_frames = 1.0/av_q2d(track->enc->time_base) + 0.5; + if (nb_frames > 255) { + av_log(NULL, AV_LOG_ERROR, "fps %d is too large\n", nb_frames); + return AVERROR(EINVAL); + } + avio_wb32(pb, 0); /* size */ ffio_wfourcc(pb, "tmcd"); /* Data format */ avio_wb32(pb, 0); /* Reserved */ |