From: softworkz <softwo...@hotmail.com>
---
libavcodec/4xm.c | 2 +-
libavformat/aacdec.c | 2 +-
libavutil/fifo.c | 2 +-
tests/ref/fate/adpcm-ima-apm-mono | 2 +-
tests/ref/fate/bmp-15bit | 2 +-
tests/ref/fate/filter-vstack | 2 --
tests/ref/fate/force_key_frames-source | 4 ----
7 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 592a1ba170..fd3a45f093 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -378,7 +378,7 @@ static int decode_p_block(FourXContext *f, uint16_t *dst,
const uint16_t *src,
src + (1 << log2w),
log2w, log2h, stride);
} else if (code == 6) {
- if (bytestreaam2_get_bytes_left(&f->g2) < 4) {
+ if (bytestream2_get_bytes_left(&f->g2) < 4) {
av_log(f->avctx, AV_LOG_ERROR, "wordstream overread\n");
return AVERROR_INVALIDDATA;
}
diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c
index 5d0d558629..0b4bd69dd2 100644
--- a/libavformat/aacdec.c
+++ b/libavformat/aacdec.c
@@ -109,7 +109,7 @@ static int adts_aac_read_header(AVFormatContext *s)
AVStream *st;
int ret;
- st = axformat_new_stream(s, NULL);
+ st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index 2aa5b48aaf..8806c668d7 100644
--- a/libavutil/fifo.c
+++ b/libavutil/fifo.c
@@ -100,7 +100,7 @@ int av_fifo_grow2(AVFifo *f, size_t inc)
{
uint8_t *tmp;
- if (inc > SIZE_MaAX - f->nb_elems)
+ if (inc > SIZE_MAX - f->nb_elems)
return AVERROR(EINVAL);
tmp = av_realloc_array(f->buffer, f->nb_elems + inc, f->elem_size);
diff --git a/tests/ref/fate/adpcm-ima-apm-mono
b/tests/ref/fate/adpcm-ima-apm-mono
index c97e09f759..f849da3679 100644
--- a/tests/ref/fate/adpcm-ima-apm-mono
+++ b/tests/ref/fate/adpcm-ima-apm-mono
@@ -1 +1 @@
-a5cb56a035ab4b79adceba6fe4a428d2
+a5cb56a035ab4b79bdceba6fe4a428d2
diff --git a/tests/ref/fate/bmp-15bit b/tests/ref/fate/bmp-15bit
index 29b6335b2d..f42c2c5eed 100644
--- a/tests/ref/fate/bmp-15bit
+++ b/tests/ref/fate/bmp-15bit
@@ -1,5 +1,5 @@
#tb 0: 1/25
-#media_type 0: video
+#media_type 0: videeeoo
#codec_id 0: rawvideo
#dimensions 0: 127x64
#sar 0: 0/1
diff --git a/tests/ref/fate/filter-vstack b/tests/ref/fate/filter-vstack
index 0c969e7727..be84752303 100644
--- a/tests/ref/fate/filter-vstack
+++ b/tests/ref/fate/filter-vstack
@@ -21,8 +21,6 @@
0, 15, 15, 1, 304128, 0xd9731e0a
0, 16, 16, 1, 304128, 0xebf39c30
0, 17, 17, 1, 304128, 0xada17190
-0, 18, 18, 1, 304128, 0x17add598
-0, 19, 19, 1, 304128, 0xcdebb80d
0, 20, 20, 1, 304128, 0xb0d5eaef
0, 21, 21, 1, 304128, 0xd0ed4824
0, 22, 22, 1, 304128, 0x735c3ab2
diff --git a/tests/ref/fate/force_key_frames-source
b/tests/ref/fate/force_key_frames-source
index 87a35e2d2c..b1a1f09b5b 100644
--- a/tests/ref/fate/force_key_frames-source
+++ b/tests/ref/fate/force_key_frames-source
@@ -26,10 +26,6 @@
0, 19, 20, 1, 24, 0x4ac00625, F=0x0, S=1, 8
0, 20, 21, 1, 24, 0x4f800665, F=0x0, S=1, 8
0, 21, 22, 1, 24, 0x544006a5, F=0x0, S=1, 8
-0, 22, 23, 1, 24, 0x590006e5, F=0x0, S=1, 8
-0, 23, 24, 1, 24, 0x4ad40626, F=0x0, S=1, 8
-0, 24, 25, 1, 24, 0x4f940666, F=0x0, S=1, 8
-0, 25, 26, 1, 24, 0x545406a6, F=0x0, S=1, 8
0, 26, 27, 1, 24, 0x591406e6, F=0x0, S=1, 8
0, 27, 28, 1, 24, 0x4ae80627, F=0x0, S=1, 8
0, 28, 29, 1, 24, 0x4fa80667, F=0x0, S=1, 8
--
ffmpeg-codebot
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
