aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/dvenc.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2022-01-06 19:19:39 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-02-07 00:31:23 +0100
commit7e2be84a9491ff2e03c1653e4dca7cc46b0e2383 (patch)
tree9f8157c81fe7aacf6ff3c4e6aab7b6bd6cf18a1c /libavformat/dvenc.c
parentd3c6156ce33911d1aa35fee3758f310f3a237696 (diff)
downloadffmpeg-7e2be84a9491ff2e03c1653e4dca7cc46b0e2383.tar.gz
lavf/dvenc: return an error on audio/video desync
Diffstat (limited to 'libavformat/dvenc.c')
-rw-r--r--libavformat/dvenc.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c
index b76539b59f..03b63cff89 100644
--- a/libavformat/dvenc.c
+++ b/libavformat/dvenc.c
@@ -255,8 +255,10 @@ static int dv_assemble_frame(AVFormatContext *s,
switch (st->codecpar->codec_type) {
case AVMEDIA_TYPE_VIDEO:
/* FIXME: we have to have more sensible approach than this one */
- if (c->has_video)
+ if (c->has_video) {
av_log(s, AV_LOG_ERROR, "Can't process DV frame #%d. Insufficient audio data or severe sync problem.\n", c->frames);
+ return AVERROR(EINVAL);
+ }
if (data_size != c->sys->frame_size) {
av_log(s, AV_LOG_ERROR, "Unexpected frame size, %d != %d\n",
data_size, c->sys->frame_size);
@@ -270,8 +272,10 @@ static int dv_assemble_frame(AVFormatContext *s,
for (i = 0; i < c->n_ast && st != c->ast[i]; i++);
/* FIXME: we have to have more sensible approach than this one */
- if (av_fifo_size(c->audio_data[i]) + data_size >= 100*MAX_AUDIO_FRAME_SIZE)
+ if (av_fifo_size(c->audio_data[i]) + data_size >= 100*MAX_AUDIO_FRAME_SIZE) {
av_log(s, AV_LOG_ERROR, "Can't process DV frame #%d. Insufficient video data or severe sync problem.\n", c->frames);
+ return AVERROR(EINVAL);
+ }
av_fifo_generic_write(c->audio_data[i], data, data_size, NULL);
reqasize = 4 * dv_audio_frame_size(c->sys, c->frames, st->codecpar->sample_rate);