[FFmpeg-cvslog] avfilter/vf_xfade: fix zx and zy comparison for slide*

2022-07-12 Thread George Floarea 
ffmpeg | branch: master | George Floarea  | Tue Jul 12 
16:29:33 2022 +0200| [9222965fdd9594ff9e921d4ad25beac4eefa2373] | committer: 
Paul B Mahol

avfilter/vf_xfade: fix zx and zy comparison for slide*

This resulted in the wrong column/row being chosen.
This can be seen best when using xfade on streams with transparency.

For example: in case of a slideleft transition, the first column from
the first input will overwrite the first column of the second stream
throught the transition.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9222965fdd9594ff9e921d4ad25beac4eefa2373
---

 libavfilter/vf_xfade.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavfilter/vf_xfade.c b/libavfilter/vf_xfade.c
index 294928c134..9f66927365 100644
--- a/libavfilter/vf_xfade.c
+++ b/libavfilter/vf_xfade.c
@@ -433,7 +433,7 @@ static void slideleft##name##_transition(AVFilterContext 
*ctx,
 for (int x = 0; x < width; x++) {  
  \
 const int zx = z + x;  
  \
 const int zz = zx % width + width * (zx < 0);  
  \
-dst[x] = (zx > 0) && (zx < width) ? xf1[zz] : xf0[zz]; 
  \
+dst[x] = (zx >= 0) && (zx < width) ? xf1[zz] : xf0[zz];
  \
 }  
  \

  \
 dst += out->linesize[p] / div; 
  \
@@ -466,7 +466,7 @@ static void slideright##name##_transition(AVFilterContext 
*ctx,
 for (int x = 0; x < out->width; x++) { 
  \
 const int zx = z + x;  
  \
 const int zz = zx % width + width * (zx < 0);  
  \
-dst[x] = (zx > 0) && (zx < width) ? xf1[zz] : xf0[zz]; 
  \
+dst[x] = (zx >= 0) && (zx < width) ? xf1[zz] : xf0[zz];
  \
 }  
  \

  \
 dst += out->linesize[p] / div; 
  \
@@ -499,7 +499,7 @@ static void slideup##name##_transition(AVFilterContext *ctx,
 const type *xf1 = (const type *)(b->data[p] + zz * 
b->linesize[p]); \

 \
 for (int x = 0; x < out->width; x++) { 
 \
-dst[x] = (zy > 0) && (zy < height) ? xf1[x] : xf0[x];  
 \
+dst[x] = (zy >= 0) && (zy < height) ? xf1[x] : xf0[x]; 
 \
 }  
 \

 \
 dst += out->linesize[p] / div; 
 \
@@ -530,7 +530,7 @@ static void slidedown##name##_transition(AVFilterContext 
*ctx,
 const type *xf1 = (const type *)(b->data[p] + zz * 
b->linesize[p]); \

 \
 for (int x = 0; x < out->width; x++) { 
 \
-dst[x] = (zy > 0) && (zy < height) ? xf1[x] : xf0[x];  
 \
+dst[x] = (zy >= 0) && (zy < height) ? xf1[x] : xf0[x]; 
 \
 }  
 \

 \
 dst += out->linesize[p] / div; 
 \

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/mov: fix possible crash in cenc_scheme_decrypt

2022-07-12 Thread ShuangxiLi 
ffmpeg | branch: master | ShuangxiLi  | Sat Jul  2 
15:40:57 2022 +0800| [046b05082dee1df500fc36b3db884101f7449383] | committer: 
Marton Balint

avformat/mov: fix possible crash in cenc_scheme_decrypt

Data does not have to be decrypted in 16-byte blocks for AES-CTR mode, so
existing buggy code can be hugely simplified.

Fixes ticket #9829.

Signed-off-by: Marton Balint 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=046b05082dee1df500fc36b3db884101f7449383
---

 libavformat/mov.c | 29 ++---
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 6eb631d45b..29828ea7e6 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -6824,9 +6824,6 @@ static int cenc_scheme_decrypt(MOVContext *c, 
MOVStreamContext *sc, AVEncryption
 {
 int i, ret;
 int bytes_of_protected_data;
-int partially_encrypted_block_size;
-uint8_t *partially_encrypted_block;
-uint8_t block[16];
 
 if (!sc->cenc.aes_ctr) {
 /* initialize the cipher */
@@ -6849,8 +6846,6 @@ static int cenc_scheme_decrypt(MOVContext *c, 
MOVStreamContext *sc, AVEncryption
 return 0;
 }
 
-partially_encrypted_block_size = 0;
-
 for (i = 0; i < sample->subsample_count; i++) {
 if (sample->subsamples[i].bytes_of_clear_data + 
sample->subsamples[i].bytes_of_protected_data > size) {
 av_log(c->fc, AV_LOG_ERROR, "subsample size exceeds the packet 
size left\n");
@@ -6863,28 +6858,8 @@ static int cenc_scheme_decrypt(MOVContext *c, 
MOVStreamContext *sc, AVEncryption
 
 /* decrypt the encrypted bytes */
 
-if (partially_encrypted_block_size) {
-memcpy(block, partially_encrypted_block, 
partially_encrypted_block_size);
-memcpy(block+partially_encrypted_block_size, input, 
16-partially_encrypted_block_size);
-av_aes_ctr_crypt(sc->cenc.aes_ctr, block, block, 16);
-memcpy(partially_encrypted_block, block, 
partially_encrypted_block_size);
-memcpy(input, block+partially_encrypted_block_size, 
16-partially_encrypted_block_size);
-input += 16-partially_encrypted_block_size;
-size -= 16-partially_encrypted_block_size;
-bytes_of_protected_data = 
sample->subsamples[i].bytes_of_protected_data - 
(16-partially_encrypted_block_size);
-} else {
-bytes_of_protected_data = 
sample->subsamples[i].bytes_of_protected_data;
-}
-
-if (i < sample->subsample_count-1) {
-int num_of_encrypted_blocks = bytes_of_protected_data/16;
-partially_encrypted_block_size = bytes_of_protected_data%16;
-if (partially_encrypted_block_size)
-partially_encrypted_block = input + 16*num_of_encrypted_blocks;
-av_aes_ctr_crypt(sc->cenc.aes_ctr, input, input, 
16*num_of_encrypted_blocks);
-} else {
-av_aes_ctr_crypt(sc->cenc.aes_ctr, input, input, 
bytes_of_protected_data);
-}
+bytes_of_protected_data = 
sample->subsamples[i].bytes_of_protected_data;
+av_aes_ctr_crypt(sc->cenc.aes_ctr, input, input, 
bytes_of_protected_data);
 
 input += bytes_of_protected_data;
 size -= bytes_of_protected_data;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/ffv1dec_template: fix indention

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Jul  4 17:19:02 2022 +0200| [eee7364c90699f50a36aaada38c52ccc0d6bf501] | 
committer: Michael Niedermayer

avcodec/ffv1dec_template: fix indention

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eee7364c90699f50a36aaada38c52ccc0d6bf501
---

 libavcodec/ffv1dec_template.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavcodec/ffv1dec_template.c b/libavcodec/ffv1dec_template.c
index 0b1d176ba1..9b1d65e825 100644
--- a/libavcodec/ffv1dec_template.c
+++ b/libavcodec/ffv1dec_template.c
@@ -93,11 +93,11 @@ static av_always_inline int RENAME(decode_line)(FFV1Context 
*s, int w,
 run_count--;
 }
 } else {
-while (run_count > 1 && w-x > 1) {
-sample[1][x] = RENAME(predict)(sample[1] + x, sample[0] + 
x);
-x++;
-run_count--;
-}
+while (run_count > 1 && w-x > 1) {
+sample[1][x] = RENAME(predict)(sample[1] + x, 
sample[0] + x);
+x++;
+run_count--;
+}
 }
 run_count--;
 if (run_count < 0) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] tools/target_dec_fuzzer: Adjust threshold for ANM

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
Jul 10 17:47:19 2022 +0200| [21938ce7397870718fed46c5d7b718646c5c0cd2] | 
committer: Michael Niedermayer

tools/target_dec_fuzzer: Adjust threshold for ANM

Fixes: Timeout
Fixes: 
48923/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ANM_fuzzer-6391662321991680

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21938ce7397870718fed46c5d7b718646c5c0cd2
---

 tools/target_dec_fuzzer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index f44cc6f857..3ba87b7f1c 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -209,6 +209,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t 
size) {
 maxsamples = maxsamples_per_frame * maxiteration;
 switch (c->p.id) {
 case AV_CODEC_ID_AGM: maxpixels  /= 1024;  break;
+case AV_CODEC_ID_ANM: maxpixels  /= 1024;  break;
 case AV_CODEC_ID_ARBC:maxpixels  /= 1024;  break;
 case AV_CODEC_ID_ARGO:maxpixels  /= 1024;  break;
 case AV_CODEC_ID_BINKVIDEO:   maxpixels  /= 32;break;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] tools/target_dec_fuzzer: Adjust threshold for CFHD

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Jul  4 21:59:10 2022 +0200| [2ebd2a6eb5d276e5b3bb199d9e51b3ae55ebb071] | 
committer: Michael Niedermayer

tools/target_dec_fuzzer: Adjust threshold for CFHD

Fixes: Timeout
Fixes: 
46504/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CFHD_fuzzer-6376835606249472

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ebd2a6eb5d276e5b3bb199d9e51b3ae55ebb071
---

 tools/target_dec_fuzzer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index 3ba87b7f1c..89b9315699 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -213,7 +213,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t 
size) {
 case AV_CODEC_ID_ARBC:maxpixels  /= 1024;  break;
 case AV_CODEC_ID_ARGO:maxpixels  /= 1024;  break;
 case AV_CODEC_ID_BINKVIDEO:   maxpixels  /= 32;break;
-case AV_CODEC_ID_CFHD:maxpixels  /= 128;   break;
+case AV_CODEC_ID_CFHD:maxpixels  /= 16384; break;
 case AV_CODEC_ID_COOK:maxsamples /= 1<<20; break;
 case AV_CODEC_ID_DFA: maxpixels  /= 1024;  break;
 case AV_CODEC_ID_DIRAC:   maxpixels  /= 8192;  break;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/wnv1: Check for width =1

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
Jul  3 02:31:47 2022 +0200| [d98d5a436aa70d3cef8f914c0467ef2fb2dd1dfc] | 
committer: Michael Niedermayer

avcodec/wnv1: Check for width =1

The decoder only outputs pixels for width >1 images, fail early

Fixes: Timeout
Fixes: 
48298/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WNV1_fuzzer-6198626319204352

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d98d5a436aa70d3cef8f914c0467ef2fb2dd1dfc
---

 libavcodec/wnv1.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c
index 0cf2181a48..6251c00187 100644
--- a/libavcodec/wnv1.c
+++ b/libavcodec/wnv1.c
@@ -125,6 +125,9 @@ static av_cold int decode_init(AVCodecContext *avctx)
 {
 static AVOnce init_static_once = AV_ONCE_INIT;
 
+if (avctx->width <= 1)
+return AVERROR_INVALIDDATA;
+
 avctx->pix_fmt = AV_PIX_FMT_YUV422P;
 
 ff_thread_once(&init_static_once, wnv1_init_static);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] tools/target_dec_fuzzer: Adjust threshold for MVC2

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Jul  4 22:37:00 2022 +0200| [bb6679a58b9148fb66b677c294f5912e23d2337a] | 
committer: Michael Niedermayer

tools/target_dec_fuzzer: Adjust threshold for MVC2

Fixes: Timeout
Fixes: 
48689/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MVC2_fuzzer-6436301427048448

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb6679a58b9148fb66b677c294f5912e23d2337a
---

 tools/target_dec_fuzzer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index 89b9315699..29e0b63231 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -247,6 +247,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t 
size) {
 case AV_CODEC_ID_MSRLE:   maxpixels  /= 16;break;
 case AV_CODEC_ID_MSS2:maxpixels  /= 16384; break;
 case AV_CODEC_ID_MSZH:maxpixels  /= 128;   break;
+case AV_CODEC_ID_MVC2:maxpixels  /= 128;   break;
 case AV_CODEC_ID_MXPEG:   maxpixels  /= 128;   break;
 case AV_CODEC_ID_OPUS:maxsamples /= 16384; break;
 case AV_CODEC_ID_PNG: maxpixels  /= 128;   break;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] tools/target_dec_fuzzer: Adjust threshold for WCMV

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sat 
Jul  2 23:47:01 2022 +0200| [35ea9590ffdfd86610fd199a95ae371e944b7b1a] | 
committer: Michael Niedermayer

tools/target_dec_fuzzer: Adjust threshold for WCMV

Fixes: Timeout
Fixes: 
48377/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WCMV_fuzzer-5053331682230272

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35ea9590ffdfd86610fd199a95ae371e944b7b1a
---

 tools/target_dec_fuzzer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index 97f4f73d6b..0b524a14cb 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -281,6 +281,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t 
size) {
 case AV_CODEC_ID_VP7: maxpixels  /= 256;   break;
 case AV_CODEC_ID_VP9: maxpixels  /= 4096;  break;
 case AV_CODEC_ID_WAVPACK: maxsamples /= 1024;  break;
+case AV_CODEC_ID_WCMV:maxpixels  /= 1024;  break;
 case AV_CODEC_ID_WMV3IMAGE:   maxpixels  /= 8192;  break;
 case AV_CODEC_ID_WMV2:maxpixels  /= 1024;  break;
 case AV_CODEC_ID_WMV3:maxpixels  /= 1024;  break;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] tools/target_dec_fuzzer: Adjust threshold for ylc

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
Jul  3 00:50:11 2022 +0200| [6003fe6344201cbb2fc6514c9ff971746ac5ff4c] | 
committer: Michael Niedermayer

tools/target_dec_fuzzer: Adjust threshold for ylc

Fixes: timeout
Fixes: 
48523/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_YLC_fuzzer-5779666425741312

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6003fe6344201cbb2fc6514c9ff971746ac5ff4c
---

 tools/target_dec_fuzzer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index 0b524a14cb..b14805eb3b 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -287,6 +287,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t 
size) {
 case AV_CODEC_ID_WMV3:maxpixels  /= 1024;  break;
 case AV_CODEC_ID_WS_VQA:  maxpixels  /= 16384; break;
 case AV_CODEC_ID_WMALOSSLESS: maxsamples /= 1024;  break;
+case AV_CODEC_ID_YLC: maxpixels  /= 1024;  break;
 case AV_CODEC_ID_ZEROCODEC:   maxpixels  /= 128;   break;
 }
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] tools/target_dec_fuzzer: Adjust threshold for CDTOONS

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed 
Jul  6 23:31:40 2022 +0200| [5bfa59b2defdfeaab5468f63190f8d15b47febc7] | 
committer: Michael Niedermayer

tools/target_dec_fuzzer: Adjust threshold for CDTOONS

Fixes: Timeout
Fixes: 
48730/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CDTOONS_fuzzer-5124342899408896

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5bfa59b2defdfeaab5468f63190f8d15b47febc7
---

 tools/target_dec_fuzzer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index 29e0b63231..97f4f73d6b 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -213,6 +213,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t 
size) {
 case AV_CODEC_ID_ARBC:maxpixels  /= 1024;  break;
 case AV_CODEC_ID_ARGO:maxpixels  /= 1024;  break;
 case AV_CODEC_ID_BINKVIDEO:   maxpixels  /= 32;break;
+case AV_CODEC_ID_CDTOONS: maxpixels  /= 1024;  break;
 case AV_CODEC_ID_CFHD:maxpixels  /= 16384; break;
 case AV_CODEC_ID_COOK:maxsamples /= 1<<20; break;
 case AV_CODEC_ID_DFA: maxpixels  /= 1024;  break;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/iff: simplify duration calculation

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Jul  4 23:32:40 2022 +0200| [0740641e932551342cc1737d981e950ecffa3b63] | 
committer: Michael Niedermayer

avformat/iff: simplify duration calculation

Fixes: signed integer overflow: 315680096256 * 134215943 cannot be represented 
in type 'long long'
Fixes: 
48713/clusterfuzz-testcase-minimized-ffmpeg_dem_IFF_fuzzer-5886272312311808

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0740641e932551342cc1737d981e950ecffa3b63
---

 libavformat/iff.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavformat/iff.c b/libavformat/iff.c
index 3c861ef34d..b37600605a 100644
--- a/libavformat/iff.c
+++ b/libavformat/iff.c
@@ -384,7 +384,7 @@ static int read_dst_frame(AVFormatContext *s, AVPacket *pkt)
 avio_skip(pb, 1);
 pkt->flags |= AV_PKT_FLAG_KEY;
 pkt->stream_index = 0;
-pkt->duration = 588LL * s->streams[0]->codecpar->sample_rate / 
44100;
+pkt->duration = s->streams[0]->codecpar->sample_rate / 75;
 pkt->pos = chunk_pos;
 
 chunk_pos = avio_tell(pb);
@@ -397,7 +397,8 @@ static int read_dst_frame(AVFormatContext *s, AVPacket *pkt)
 case ID_FRTE:
 if (data_size < 4)
 return AVERROR_INVALIDDATA;
-s->streams[0]->duration = avio_rb32(pb) * 588LL * 
s->streams[0]->codecpar->sample_rate / 44100;
+s->streams[0]->duration = avio_rb32(pb) * 
(uint64_t)s->streams[0]->codecpar->sample_rate / 75;
+
 break;
 }
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] tools/target_dec_fuzzer: Adjust threshold for LOCO

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
Jul  3 01:00:30 2022 +0200| [248d98107125dde5facb4058a1a8c102d0f59406] | 
committer: Michael Niedermayer

tools/target_dec_fuzzer: Adjust threshold for LOCO

Fixes: Timeout
Fixes: 
48584/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LOCO_fuzzer-5741269015461888

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=248d98107125dde5facb4058a1a8c102d0f59406
---

 tools/target_dec_fuzzer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index b14805eb3b..4c3135bbb3 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -240,6 +240,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t 
size) {
 case AV_CODEC_ID_INTERPLAY_ACM: maxsamples /= 16384;  break;
 case AV_CODEC_ID_JPEG2000:maxpixels  /= 16;break;
 case AV_CODEC_ID_LAGARITH:maxpixels  /= 1024;  break;
+case AV_CODEC_ID_LOCO:maxpixels  /= 1024;  break;
 case AV_CODEC_ID_VORBIS:  maxsamples /= 1024;  break;
 case AV_CODEC_ID_LSCR:maxpixels  /= 16;break;
 case AV_CODEC_ID_MOTIONPIXELS:maxpixels  /= 256;   break;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/ffv1dec: Limit golomb rice coded slices to width 8M

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
Jul  3 13:31:19 2022 +0200| [b4431399ec1e10afff458cf1ffae2a75987d725a] | 
committer: Michael Niedermayer

avcodec/ffv1dec: Limit golomb rice coded slices to width 8M

This limit is possibly not reachable due to other restrictions on buffers but
the decoder run table is too small beyond this, so explicitly check for it.

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b4431399ec1e10afff458cf1ffae2a75987d725a
---

 libavcodec/ffv1dec.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index 365f8b77a7..7731c15c87 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -187,6 +187,9 @@ static int decode_slice_header(const FFV1Context *f, 
FFV1Context *fs)
  || (unsigned)fs->slice_y + (uint64_t)fs->slice_height > f->height)
 return -1;
 
+if (fs->ac == AC_GOLOMB_RICE && fs->slice_width >= (1<<23))
+return AVERROR_INVALIDDATA;
+
 for (i = 0; i < f->plane_count; i++) {
 PlaneContext * const p = &fs->plane[i];
 int idx = get_symbol(c, state, 0);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/avienc: Check video dimensions

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
Jul  3 14:05:13 2022 +0200| [ba0c3d1db420dfaeaec44a8bbd40ec5593dccb04] | 
committer: Michael Niedermayer

avformat/avienc: Check video dimensions

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba0c3d1db420dfaeaec44a8bbd40ec5593dccb04
---

 libavformat/avienc.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 2264241d57..14115b3e2b 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -426,6 +426,10 @@ static int avi_write_header(AVFormatContext *s)
 avio_wl32(pb, -1); /* quality */
 avio_wl32(pb, au_ssize); /* sample size */
 avio_wl32(pb, 0);
+if (par->width > 65535 || par->height > 65535) {
+av_log(s, AV_LOG_ERROR, "%dx%d dimensions are too big\n", 
par->width, par->height);
+return AVERROR(EINVAL);
+}
 avio_wl16(pb, par->width);
 avio_wl16(pb, par->height);
 ff_end_tag(pb, strh);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/ffv1dec: Check for min packet size

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
Jul  3 14:19:54 2022 +0200| [78b95530f0a1f04864079614b251b765b1ee77ec] | 
committer: Michael Niedermayer

avcodec/ffv1dec: Check for min packet size

Fixes: Timeout
Fixes: 
48619/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_fuzzer-5793597923917824

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=78b95530f0a1f04864079614b251b765b1ee77ec
---

 libavcodec/ffv1dec.c | 8 
 1 file changed, 8 insertions(+)

diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index 7731c15c87..01ddcaa512 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -879,6 +879,14 @@ static int decode_frame(AVCodecContext *avctx, AVFrame 
*rframe,
 p->key_frame = 0;
 }
 
+if (f->ac != AC_GOLOMB_RICE) {
+if (buf_size < avctx->width * avctx->height / (128*8))
+return AVERROR_INVALIDDATA;
+} else {
+if (buf_size < avctx->height / 8)
+return AVERROR_INVALIDDATA;
+}
+
 ret = ff_thread_get_ext_buffer(avctx, &f->picture, AV_GET_BUFFER_FLAG_REF);
 if (ret < 0)
 return ret;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/aaxdec: Check for empty segments

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Jun 27 10:29:25 2022 +0200| [db31b3ea861c280e7fae282d06957ebd0d37c2d2] | 
committer: Michael Niedermayer

avformat/aaxdec: Check for empty segments

Fixes: Timeout
Fixes: 
48154/clusterfuzz-testcase-minimized-ffmpeg_dem_AAX_fuzzer-5149094353436672

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db31b3ea861c280e7fae282d06957ebd0d37c2d2
---

 libavformat/aaxdec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/aaxdec.c b/libavformat/aaxdec.c
index dd1fbde736..4e352f8ce3 100644
--- a/libavformat/aaxdec.c
+++ b/libavformat/aaxdec.c
@@ -250,6 +250,8 @@ static int aax_read_header(AVFormatContext *s)
 
 start = avio_rb32(pb);
 size  = avio_rb32(pb);
+if (!size)
+return AVERROR_INVALIDDATA;
 a->segments[r].start = start + a->data_offset;
 a->segments[r].end   = a->segments[r].start + size;
 if (r &&

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/qpeldsp: copy less for the mc0x cases

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
Jun 26 00:59:15 2022 +0200| [e690d4edf581c42dbd907c0fafe53fba86a00812] | 
committer: Michael Niedermayer

avcodec/qpeldsp: copy less for the mc0x cases

Fixes: out of array access
Fixes: 
47936/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-5745039940124672

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e690d4edf581c42dbd907c0fafe53fba86a00812
---

 libavcodec/qpeldsp.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavcodec/qpeldsp.c b/libavcodec/qpeldsp.c
index 2b9146ceb1..5f937f9d9e 100644
--- a/libavcodec/qpeldsp.c
+++ b/libavcodec/qpeldsp.c
@@ -199,7 +199,7 @@ static void OPNAME ## qpel8_mc01_c(uint8_t *dst, const 
uint8_t *src,  \
 uint8_t full[16 * 9]; \
 uint8_t half[64]; \
   \
-copy_block9(full, src, 16, stride, 9);\
+copy_block8(full, src, 16, stride, 9);\
 put ## RND ## mpeg4_qpel8_v_lowpass(half, full, 8, 16);   \
 OPNAME ## pixels8_l2_8(dst, full, half, stride, 16, 8, 8);\
 } \
@@ -209,7 +209,7 @@ static void OPNAME ## qpel8_mc02_c(uint8_t *dst, const 
uint8_t *src,  \
 { \
 uint8_t full[16 * 9]; \
   \
-copy_block9(full, src, 16, stride, 9);\
+copy_block8(full, src, 16, stride, 9);\
 OPNAME ## mpeg4_qpel8_v_lowpass(dst, full, stride, 16);   \
 } \
   \
@@ -219,7 +219,7 @@ static void OPNAME ## qpel8_mc03_c(uint8_t *dst, const 
uint8_t *src,  \
 uint8_t full[16 * 9]; \
 uint8_t half[64]; \
   \
-copy_block9(full, src, 16, stride, 9);\
+copy_block8(full, src, 16, stride, 9);\
 put ## RND ## mpeg4_qpel8_v_lowpass(half, full, 8, 16);   \
 OPNAME ## pixels8_l2_8(dst, full + 16, half, stride, 16, 8, 8);   \
 } \
@@ -459,7 +459,7 @@ static void OPNAME ## qpel16_mc01_c(uint8_t *dst, const 
uint8_t *src, \
 uint8_t full[24 * 17];\
 uint8_t half[256];\
   \
-copy_block17(full, src, 24, stride, 17);  \
+copy_block16(full, src, 24, stride, 17);  \
 put ## RND ## mpeg4_qpel16_v_lowpass(half, full, 16, 24); \
 OPNAME ## pixels16_l2_8(dst, full, half, stride, 24, 16, 16); \
 } \
@@ -469,7 +469,7 @@ static void OPNAME ## qpel16_mc02_c(uint8_t *dst, const 
uint8_t *src, \
 { \
 uint8_t full[24 * 17];\
   \
-copy_block17(full, src, 24, stride, 17);  \
+copy_block16(full, src, 24, stride, 17);  \
 OPNAME ## mpeg4_qpel16_v_lowpass(dst, full, stride, 24);  \
 } \
   \
@@ -479,7 +479,7 @@ static void OPNAME ## qpel16_mc03_c(uint8_t *dst, const 
uint8_t *src, \
 uint8_t full[24 * 17];\
 uint8_t half[256];\
   \
-copy_block17(full, src, 24, stride, 17);  \
+copy_block16(f

[FFmpeg-cvslog] avcodec/tiff: Check pixel format types for dng

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Thu 
Jun 30 00:52:20 2022 +0200| [75f3d1b82261f31c6bbcee8046cec6792194355a] | 
committer: Michael Niedermayer

avcodec/tiff: Check pixel format types for dng

Fixes: out of array access
Fixes: 
48271/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-6149705769287680

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=75f3d1b82261f31c6bbcee8046cec6792194355a
---

 libavcodec/tiff.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index e4a5d3c537..bf69b083b3 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -761,6 +761,7 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, 
uint8_t *dst, int strid
 if (s->is_bayer) {
 av_assert0(width == (s->bpp * s->width + 7) >> 3);
 }
+av_assert0(!(s->is_bayer && is_yuv));
 if (p->format == AV_PIX_FMT_GRAY12) {
 av_fast_padded_malloc(&s->yuv_line, &s->yuv_line_size, width);
 if (s->yuv_line == NULL) {
@@ -844,6 +845,8 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, 
uint8_t *dst, int strid
 av_log(s->avctx, AV_LOG_ERROR, "More than one DNG JPEG strips 
unsupported\n");
 return AVERROR_PATCHWELCOME;
 }
+if (!s->is_bayer)
+return AVERROR_PATCHWELCOME;
 if ((ret = dng_decode_jpeg(s->avctx, p, s->stripsize, 0, 0, s->width, 
s->height)) < 0)
 return ret;
 return 0;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] tools/target_dec_fuzzer: adjust threshold for cinepak

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Tue 
Jun 28 03:07:23 2022 +0200| [675e18e0fb9fc7a7e568a37ee8335798306e7063] | 
committer: Michael Niedermayer

tools/target_dec_fuzzer: adjust threshold for cinepak

Fixes: Timeout
Fixes: 
48158/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CINEPAK_fuzzer-5986526573494272

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=675e18e0fb9fc7a7e568a37ee8335798306e7063
---

 tools/target_dec_fuzzer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index 4c3135bbb3..88c2686ae4 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -215,6 +215,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t 
size) {
 case AV_CODEC_ID_BINKVIDEO:   maxpixels  /= 32;break;
 case AV_CODEC_ID_CDTOONS: maxpixels  /= 1024;  break;
 case AV_CODEC_ID_CFHD:maxpixels  /= 16384; break;
+case AV_CODEC_ID_CINEPAK: maxpixels  /= 128;   break;
 case AV_CODEC_ID_COOK:maxsamples /= 1<<20; break;
 case AV_CODEC_ID_DFA: maxpixels  /= 1024;  break;
 case AV_CODEC_ID_DIRAC:   maxpixels  /= 8192;  break;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] tools/target_dec_fuzzer: Adjust threshold for AASC

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sat 
Jun 18 21:01:47 2022 +0200| [f20295cd818c5e24e558d8040e3df9505f49f47c] | 
committer: Michael Niedermayer

tools/target_dec_fuzzer: Adjust threshold for AASC

Fixes: Timeout
Fixes: 
47919/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AASC_fuzzer-5176435830030336

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f20295cd818c5e24e558d8040e3df9505f49f47c
---

 tools/target_dec_fuzzer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index 88c2686ae4..f4d65974cd 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -208,6 +208,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t 
size) {
 maxpixels = maxpixels_per_frame * maxiteration;
 maxsamples = maxsamples_per_frame * maxiteration;
 switch (c->p.id) {
+case AV_CODEC_ID_AASC:maxpixels  /= 1024;  break;
 case AV_CODEC_ID_AGM: maxpixels  /= 1024;  break;
 case AV_CODEC_ID_ANM: maxpixels  /= 1024;  break;
 case AV_CODEC_ID_ARBC:maxpixels  /= 1024;  break;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] tools/target_dec_fuzzer: adjust threshold for flic

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
Jun 20 00:50:36 2022 +0200| [a5625fecd74c2a4de426bfd7e2811f9a43ef5485] | 
committer: Michael Niedermayer

tools/target_dec_fuzzer: adjust threshold for flic

Fixes: Timeout
Fixes: 
48017/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FLIC_fuzzer-5920256150863872

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a5625fecd74c2a4de426bfd7e2811f9a43ef5485
---

 tools/target_dec_fuzzer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index f4d65974cd..1587045e02 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -227,6 +227,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t 
size) {
 case AV_CODEC_ID_DXV: maxpixels  /= 32;break;
 case AV_CODEC_ID_FFWAVESYNTH: maxsamples /= 16384; break;
 case AV_CODEC_ID_FLAC:maxsamples /= 1024;  break;
+case AV_CODEC_ID_FLIC:maxpixels  /= 1024;  break;
 case AV_CODEC_ID_FLV1:maxpixels  /= 1024;  break;
 case AV_CODEC_ID_G2M: maxpixels  /= 1024;  break;
 case AV_CODEC_ID_GEM: maxpixels  /= 512;   break;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/hevcdsp_template: stay within tables in sao_band_filter()

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Thu 
Jun  9 22:21:55 2022 +0200| [9c5250a5612d4b32d79108de0c03945b2017963e] | 
committer: Michael Niedermayer

avcodec/hevcdsp_template: stay within tables in sao_band_filter()

Fixes: out of array read
Fixes: 
47875/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5719393113341952

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9c5250a5612d4b32d79108de0c03945b2017963e
---

 libavcodec/hevcdsp_template.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/hevcdsp_template.c b/libavcodec/hevcdsp_template.c
index 56cd9e605d..61425975cd 100644
--- a/libavcodec/hevcdsp_template.c
+++ b/libavcodec/hevcdsp_template.c
@@ -313,7 +313,7 @@ static void FUNC(sao_band_filter)(uint8_t *_dst, uint8_t 
*_src,
 offset_table[(k + sao_left_class) & 31] = sao_offset_val[k + 1];
 for (y = 0; y < height; y++) {
 for (x = 0; x < width; x++)
-dst[x] = av_clip_pixel(src[x] + offset_table[src[x] >> shift]);
+dst[x] = av_clip_pixel(src[x] + offset_table[(src[x] >> shift) & 
31]);
 dst += stride_dst;
 src += stride_src;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/rtsp: break on unknown protocols

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Fri 
May 20 00:50:33 2022 +0200| [73c0fd27c5c53c42e5060fb3a0c1fc5708b6f670] | 
committer: Michael Niedermayer

avformat/rtsp: break on unknown protocols

This function needs more cleanup and it lacks error handling

Fixes: use of uninitialized memory
Fixes: CID700776

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73c0fd27c5c53c42e5060fb3a0c1fc5708b6f670
---

 libavformat/rtsp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 88e9ef5226..f948f1d395 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -949,6 +949,8 @@ static void rtsp_parse_transport(AVFormatContext *s,
  ";,", &p);
 }
 th->transport = RTSP_TRANSPORT_RAW;
+} else {
+break;
 }
 if (!av_strcasecmp(lower_transport, "TCP"))
 th->lower_transport = RTSP_LOWER_TRANSPORT_TCP;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/sbrdsp_fixed: Fix integer overflows in sbr_qmf_deint_neg_c()

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
May  2 00:51:12 2022 +0200| [1537f40516d625fc5fa57db4fdfb737312fbc500] | 
committer: Michael Niedermayer

avcodec/sbrdsp_fixed: Fix integer overflows in sbr_qmf_deint_neg_c()

Fixes: signed integer overflow: 2147483645 + 16 cannot be represented in type 
'int'
Fixes: 
46993/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-4759025234870272

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1537f40516d625fc5fa57db4fdfb737312fbc500
---

 libavcodec/sbrdsp_fixed.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/sbrdsp_fixed.c b/libavcodec/sbrdsp_fixed.c
index 43fcc90ae5..0d34a2a710 100644
--- a/libavcodec/sbrdsp_fixed.c
+++ b/libavcodec/sbrdsp_fixed.c
@@ -114,8 +114,8 @@ static void sbr_qmf_deint_neg_c(int *v, const int *src)
 {
 int i;
 for (i = 0; i < 32; i++) {
-v[ i] = ( src[63 - 2*i] + 0x10) >> 5;
-v[63 - i] = (-src[63 - 2*i - 1] + 0x10) >> 5;
+v[ i] = (int)(0x10U + src[63 - 2*i]) >> 5;
+v[63 - i] = (int)(0x10U - src[63 - 2*i - 1]) >> 5;
 }
 }
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/pixlet: consider minimum plane header in the minimal packet size

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
May  1 00:20:40 2022 +0200| [4f9ee4bf43623ff0960d3d8cf2025c2cdb54382a] | 
committer: Michael Niedermayer

avcodec/pixlet: consider minimum plane header in the minimal packet size

Fixes: Timeout
Fixes: 
46956/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PIXLET_fuzzer-5698161106092032

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4f9ee4bf43623ff0960d3d8cf2025c2cdb54382a
---

 libavcodec/pixlet.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/pixlet.c b/libavcodec/pixlet.c
index 3174f30e91..4f9282bb94 100644
--- a/libavcodec/pixlet.c
+++ b/libavcodec/pixlet.c
@@ -611,7 +611,7 @@ static int pixlet_decode_frame(AVCodecContext *avctx, 
AVFrame *p,
 bytestream2_init(&ctx->gb, avpkt->data, avpkt->size);
 
 pktsize = bytestream2_get_be32(&ctx->gb);
-if (pktsize <= 44 || pktsize - 4 > bytestream2_get_bytes_left(&ctx->gb)) {
+if (pktsize <= 44 + (NB_LEVELS * 8 + 6) * 3 || pktsize - 4 > 
bytestream2_get_bytes_left(&ctx->gb)) {
 av_log(avctx, AV_LOG_ERROR, "Invalid packet size %"PRIu32"\n", 
pktsize);
 return AVERROR_INVALIDDATA;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avfilter/vf_signature: Fix integer overflow in filter_frame()

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed 
May 18 02:10:52 2022 +0200| [dd6040675ec18d19429f882caea6bb306ed6677a] | 
committer: Michael Niedermayer

avfilter/vf_signature: Fix integer overflow in filter_frame()

Fixes: CID1403233

The second of the 2 changes may be unneeded but will help coverity

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dd6040675ec18d19429f882caea6bb306ed6677a
---

 libavfilter/vf_signature.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/vf_signature.c b/libavfilter/vf_signature.c
index 5cff149756..7d434328b7 100644
--- a/libavfilter/vf_signature.c
+++ b/libavfilter/vf_signature.c
@@ -219,7 +219,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame 
*picref)
 dw1 = inlink->w / 32;
 if (inlink->w % 32)
 dw2 = dw1 + 1;
-denom = (sc->divide) ? dh1 * dh2 * dw1 * dw2 : 1;
+denom = (sc->divide) ? dh1 * (int64_t)dh2 * dw1 * dw2 : 1;
 
 for (i = 0; i < 32; i++) {
 rowcount = 0;
@@ -245,7 +245,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame 
*picref)
 }
 }
 
-denom = (sc->divide) ? 1 : dh1 * dh2 * dw1 * dw2;
+denom = (sc->divide) ? 1 : dh1 * (int64_t)dh2 * dw1 * dw2;
 
 for (i = 0; i < ELEMENT_COUNT; i++) {
 const ElemCat* elemcat = elements[i];

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/h264dec: Skip late SEI

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed 
Apr 27 22:16:51 2022 +0200| [f7dd408d64013ae177c1f8d0e04418e5075db5bc] | 
committer: Michael Niedermayer

avcodec/h264dec: Skip late SEI

Fixes: Race condition
Fixes: 
clusterfuzz-testcase-minimized-mediasource_MP2T_AVC_pipeline_integration_fuzzer-6282675434094592

Found-by: google ClusterFuzz
Tested-by: Dan Sanders 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7dd408d64013ae177c1f8d0e04418e5075db5bc
---

 libavcodec/h264dec.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
index d80bc6b17f..2a5b53ea56 100644
--- a/libavcodec/h264dec.c
+++ b/libavcodec/h264dec.c
@@ -672,6 +672,10 @@ static int decode_nal_units(H264Context *h, const uint8_t 
*buf, int buf_size)
 avpriv_request_sample(avctx, "data partitioning");
 break;
 case H264_NAL_SEI:
+if (h->setup_finished) {
+avpriv_request_sample(avctx, "Late SEI");
+break;
+}
 ret = ff_h264_sei_decode(&h->sei, &nal->gb, &h->ps, avctx);
 h->has_recovery_point = h->has_recovery_point || 
h->sei.recovery_point.recovery_frame_cnt != -1;
 if (avctx->debug & FF_DEBUG_GREEN_MD)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] doc/APIchanges: Fill in missing things

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Tue 
Jul 12 23:58:55 2022 +0200| [510cd7d11b0f52b330b5c2e1506aa40ff7a5d755] | 
committer: Michael Niedermayer

doc/APIchanges: Fill in missing things

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=510cd7d11b0f52b330b5c2e1506aa40ff7a5d755
---

 doc/APIchanges | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index a56235b092..e6376ff15c 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -14,24 +14,24 @@ libavutil: 2021-04-27
 
 API changes, most recent first:
 
-2022-06-12 - xx - lavf 59.25.100 - avio.h
+2022-06-12 - 7cae3d8b76 - lavf 59.25.100 - avio.h
   Add avio_vprintf(), similar to avio_printf() but allow to use it
   from within a function taking a variable argument list as input.
 
-2022-06-12 - x - lavu 57.27.100 - uuid.h
+2022-06-12 - ff59ecc4de - lavu 57.27.100 - uuid.h
   Add UUID handling functions.
   Add av_uuid_parse(), av_uuid_urn_parse(), av_uuid_parse_range(),
   av_uuid_parse_range(), av_uuid_equal(), av_uuid_copy(), and av_uuid_nil().
 
-2022-06-01 - x - lavu 57.26.100 - csp.h
+2022-06-01 - d42b410e05 - lavu 57.26.100 - csp.h
   Add public API for colorspace structs.
   Add av_csp_luma_coeffs_from_avcsp(), av_csp_primaries_desc_from_id(),
   and av_csp_primaries_id_from_desc().
 
-2022-05-23 - x - lavu 57.25.100 - avutil.h
+2022-05-23 - 4cdc14aa95 - lavu 57.25.100 - avutil.h
   Deprecate av_fopen_utf8() without replacement.
 
-2022-03-16 - xx - all libraries - version_major.h
+2022-03-16 - f3a0e2ee2b - all libraries - version_major.h
   Add lib/version_major.h as new installed headers, which only
   contain the major version number (and corresponding API deprecation
   defines).
@@ -73,10 +73,10 @@ API changes, most recent first:
   Update AVFrame for the new channel layout API: add ch_layout, deprecate
   channels/channel_layout.
 
-2022-03-10 - xx - lavu 57.23.100 - cpu.h
+2022-03-10 - f629ea2e18 - lavu 57.23.100 - cpu.h
   Add AV_CPU_FLAG_AVX512ICL.
 
-2022-02-07 - xx - lavu 57.21.100 - fifo.h
+2022-02-07 - a10f1aec1f - lavu 57.21.100 - fifo.h
   Deprecate AVFifoBuffer and the API around it, namely av_fifo_alloc(),
   av_fifo_alloc_array(), av_fifo_free(), av_fifo_freep(), av_fifo_reset(),
   av_fifo_size(), av_fifo_space(), av_fifo_generic_peek_at(),
@@ -84,7 +84,7 @@ API changes, most recent first:
   av_fifo_realloc2(), av_fifo_grow(), av_fifo_drain() and av_fifo_peek2().
   Users should switch to the AVFifo-API.
 
-2022-02-07 - xx - lavu 57.20.100 - fifo.h
+2022-02-07 - 7329b22c05 - lavu 57.20.100 - fifo.h
   Add a new FIFO API, which allows setting a FIFO element size.
   This API operates on these elements rather than on bytes.
   Add av_fifo_alloc2(), av_fifo_elem_size(), av_fifo_can_read(),

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] doc/APIchanges: Extend hash which has become ambiguous

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Tue 
Jul 12 23:58:31 2022 +0200| [eafe641d130cb5941b672af3d7c90072036bebe7] | 
committer: Michael Niedermayer

doc/APIchanges: Extend hash which has become ambiguous

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eafe641d130cb5941b672af3d7c90072036bebe7
---

 doc/APIchanges | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 20b944933a..a56235b092 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -1687,7 +1687,7 @@ API changes, most recent first:
 2014-04-15 - ef818d8 - lavf 55.37.101 - avformat.h
   Add av_format_inject_global_side_data()
 
-2014-04-12 - 4f698be - lavu 52.76.100 - log.h
+2014-04-12 - 4f698be8f - lavu 52.76.100 - log.h
   Add av_log_get_flags()
 
 2014-04-11 - 6db42a2b - lavd 55.12.100 - avdevice.h

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] doc/APIchanges: Add 5.1 branch cutpoint

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed 
Jul 13 00:04:15 2022 +0200| [3421476eb552ec4d45fd9e654a04c2da2c22e49e] | 
committer: Michael Niedermayer

doc/APIchanges: Add 5.1 branch cutpoint

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3421476eb552ec4d45fd9e654a04c2da2c22e49e
---

 doc/APIchanges | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/APIchanges b/doc/APIchanges
index e6376ff15c..f9a1484bbc 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -14,6 +14,8 @@ libavutil: 2021-04-27
 
 API changes, most recent first:
 
+ 8< - FFmpeg 5.1 was cut here  8< -
+
 2022-06-12 - 7cae3d8b76 - lavf 59.25.100 - avio.h
   Add avio_vprintf(), similar to avio_printf() but allow to use it
   from within a function taking a variable argument list as input.

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] Bump Versions for 5.1 branch

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed 
Jul 13 00:27:37 2022 +0200| [6f1b144358e3f5cb100615ffee8fe779e1d2] | 
committer: Michael Niedermayer

Bump Versions for 5.1 branch

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f1b144358e3f5cb100615ffee8fe779e1d2
---

 libavcodec/version.h| 2 +-
 libavdevice/version.h   | 2 +-
 libavfilter/version.h   | 2 +-
 libavformat/version.h   | 2 +-
 libavutil/version.h | 2 +-
 libpostproc/version.h   | 2 +-
 libswresample/version.h | 2 +-
 libswscale/version.h| 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavcodec/version.h b/libavcodec/version.h
index 34b059a8a9..376388c5bb 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
 
 #include "version_major.h"
 
-#define LIBAVCODEC_VERSION_MINOR  36
+#define LIBAVCODEC_VERSION_MINOR  37
 #define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
diff --git a/libavdevice/version.h b/libavdevice/version.h
index 09c1d778dc..a458e0f33f 100644
--- a/libavdevice/version.h
+++ b/libavdevice/version.h
@@ -29,7 +29,7 @@
 
 #include "version_major.h"
 
-#define LIBAVDEVICE_VERSION_MINOR   6
+#define LIBAVDEVICE_VERSION_MINOR   7
 #define LIBAVDEVICE_VERSION_MICRO 100
 
 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 2f4f4c6c21..ceead918ee 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -31,7 +31,7 @@
 
 #include "version_major.h"
 
-#define LIBAVFILTER_VERSION_MINOR  43
+#define LIBAVFILTER_VERSION_MINOR  44
 #define LIBAVFILTER_VERSION_MICRO 100
 
 
diff --git a/libavformat/version.h b/libavformat/version.h
index 0708d619c0..b234218b10 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
 
 #include "version_major.h"
 
-#define LIBAVFORMAT_VERSION_MINOR  26
+#define LIBAVFORMAT_VERSION_MINOR  27
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
diff --git a/libavutil/version.h b/libavutil/version.h
index 2e9e02dda8..87178e9e9a 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -79,7 +79,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  57
-#define LIBAVUTIL_VERSION_MINOR  27
+#define LIBAVUTIL_VERSION_MINOR  28
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
diff --git a/libpostproc/version.h b/libpostproc/version.h
index 833351cb0e..397f3f74a7 100644
--- a/libpostproc/version.h
+++ b/libpostproc/version.h
@@ -30,7 +30,7 @@
 
 #include "version_major.h"
 
-#define LIBPOSTPROC_VERSION_MINOR   5
+#define LIBPOSTPROC_VERSION_MINOR   6
 #define LIBPOSTPROC_VERSION_MICRO 100
 
 #define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \
diff --git a/libswresample/version.h b/libswresample/version.h
index 334b6681e2..7e5c58ec87 100644
--- a/libswresample/version.h
+++ b/libswresample/version.h
@@ -30,7 +30,7 @@
 
 #include "version_major.h"
 
-#define LIBSWRESAMPLE_VERSION_MINOR   6
+#define LIBSWRESAMPLE_VERSION_MINOR   7
 #define LIBSWRESAMPLE_VERSION_MICRO 100
 
 #define LIBSWRESAMPLE_VERSION_INT  AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, 
\
diff --git a/libswscale/version.h b/libswscale/version.h
index f573bef6fc..4c6af261e6 100644
--- a/libswscale/version.h
+++ b/libswscale/version.h
@@ -28,7 +28,7 @@
 
 #include "version_major.h"
 
-#define LIBSWSCALE_VERSION_MINOR   6
+#define LIBSWSCALE_VERSION_MINOR   7
 #define LIBSWSCALE_VERSION_MICRO 100
 
 #define LIBSWSCALE_VERSION_INT  AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] Bump versions after 5.1 branch

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed 
Jul 13 00:29:05 2022 +0200| [fd26b07e8b69687c9787e40084b05eb17f54af4c] | 
committer: Michael Niedermayer

Bump versions after 5.1 branch

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd26b07e8b69687c9787e40084b05eb17f54af4c
---

 libavcodec/version.h| 2 +-
 libavdevice/version.h   | 2 +-
 libavfilter/version.h   | 2 +-
 libavformat/version.h   | 2 +-
 libavutil/version.h | 2 +-
 libpostproc/version.h   | 2 +-
 libswresample/version.h | 2 +-
 libswscale/version.h| 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavcodec/version.h b/libavcodec/version.h
index 376388c5bb..0fae3d06d3 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
 
 #include "version_major.h"
 
-#define LIBAVCODEC_VERSION_MINOR  37
+#define LIBAVCODEC_VERSION_MINOR  38
 #define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
diff --git a/libavdevice/version.h b/libavdevice/version.h
index a458e0f33f..42f163c96a 100644
--- a/libavdevice/version.h
+++ b/libavdevice/version.h
@@ -29,7 +29,7 @@
 
 #include "version_major.h"
 
-#define LIBAVDEVICE_VERSION_MINOR   7
+#define LIBAVDEVICE_VERSION_MINOR   8
 #define LIBAVDEVICE_VERSION_MICRO 100
 
 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
diff --git a/libavfilter/version.h b/libavfilter/version.h
index ceead918ee..b1915afcea 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -31,7 +31,7 @@
 
 #include "version_major.h"
 
-#define LIBAVFILTER_VERSION_MINOR  44
+#define LIBAVFILTER_VERSION_MINOR  45
 #define LIBAVFILTER_VERSION_MICRO 100
 
 
diff --git a/libavformat/version.h b/libavformat/version.h
index b234218b10..96a44ec4d1 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
 
 #include "version_major.h"
 
-#define LIBAVFORMAT_VERSION_MINOR  27
+#define LIBAVFORMAT_VERSION_MINOR  28
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
diff --git a/libavutil/version.h b/libavutil/version.h
index 87178e9e9a..f185322550 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -79,7 +79,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  57
-#define LIBAVUTIL_VERSION_MINOR  28
+#define LIBAVUTIL_VERSION_MINOR  29
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
diff --git a/libpostproc/version.h b/libpostproc/version.h
index 397f3f74a7..c258957d4d 100644
--- a/libpostproc/version.h
+++ b/libpostproc/version.h
@@ -30,7 +30,7 @@
 
 #include "version_major.h"
 
-#define LIBPOSTPROC_VERSION_MINOR   6
+#define LIBPOSTPROC_VERSION_MINOR   7
 #define LIBPOSTPROC_VERSION_MICRO 100
 
 #define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \
diff --git a/libswresample/version.h b/libswresample/version.h
index 7e5c58ec87..66bac2fa9b 100644
--- a/libswresample/version.h
+++ b/libswresample/version.h
@@ -30,7 +30,7 @@
 
 #include "version_major.h"
 
-#define LIBSWRESAMPLE_VERSION_MINOR   7
+#define LIBSWRESAMPLE_VERSION_MINOR   8
 #define LIBSWRESAMPLE_VERSION_MICRO 100
 
 #define LIBSWRESAMPLE_VERSION_INT  AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, 
\
diff --git a/libswscale/version.h b/libswscale/version.h
index 4c6af261e6..c0610fec1e 100644
--- a/libswscale/version.h
+++ b/libswscale/version.h
@@ -28,7 +28,7 @@
 
 #include "version_major.h"
 
-#define LIBSWSCALE_VERSION_MINOR   7
+#define LIBSWSCALE_VERSION_MINOR   8
 #define LIBSWSCALE_VERSION_MICRO 100
 
 #define LIBSWSCALE_VERSION_INT  AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] Changelog: Add version

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed 
Jul 13 00:29:57 2022 +0200| [5cd041f46379b70c4e72b2d48af725c1709fb3f4] | 
committer: Michael Niedermayer

Changelog: Add version 

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5cd041f46379b70c4e72b2d48af725c1709fb3f4
---

 Changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Changelog b/Changelog
index d77bba51f6..121cfc3d90 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,9 @@
 Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.
 
+version :
+
+
 version 5.1:
 - add ipfs/ipns protocol support
 - dialogue enhance audio filter

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] RELEASE: update after 5.1 branch

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed 
Jul 13 00:31:42 2022 +0200| [a0994440e8e66ff4f67aae56c01ee2727c7d283c] | 
committer: Michael Niedermayer

RELEASE: update after 5.1 branch

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0994440e8e66ff4f67aae56c01ee2727c7d283c
---

 RELEASE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE b/RELEASE
index 826fe7119d..238679db50 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-4.4.git
+5.1.git

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] Bump Versions for 5.1 branch

2022-07-12 Thread Michael Niedermayer 
ffmpeg | branch: release/5.1 | Michael Niedermayer  | 
Wed Jul 13 00:27:37 2022 +0200| [6f1b144358e3f5cb100615ffee8fe779e1d2] | 
committer: Michael Niedermayer

Bump Versions for 5.1 branch

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f1b144358e3f5cb100615ffee8fe779e1d2
---

 libavcodec/version.h| 2 +-
 libavdevice/version.h   | 2 +-
 libavfilter/version.h   | 2 +-
 libavformat/version.h   | 2 +-
 libavutil/version.h | 2 +-
 libpostproc/version.h   | 2 +-
 libswresample/version.h | 2 +-
 libswscale/version.h| 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavcodec/version.h b/libavcodec/version.h
index 34b059a8a9..376388c5bb 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
 
 #include "version_major.h"
 
-#define LIBAVCODEC_VERSION_MINOR  36
+#define LIBAVCODEC_VERSION_MINOR  37
 #define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
diff --git a/libavdevice/version.h b/libavdevice/version.h
index 09c1d778dc..a458e0f33f 100644
--- a/libavdevice/version.h
+++ b/libavdevice/version.h
@@ -29,7 +29,7 @@
 
 #include "version_major.h"
 
-#define LIBAVDEVICE_VERSION_MINOR   6
+#define LIBAVDEVICE_VERSION_MINOR   7
 #define LIBAVDEVICE_VERSION_MICRO 100
 
 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 2f4f4c6c21..ceead918ee 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -31,7 +31,7 @@
 
 #include "version_major.h"
 
-#define LIBAVFILTER_VERSION_MINOR  43
+#define LIBAVFILTER_VERSION_MINOR  44
 #define LIBAVFILTER_VERSION_MICRO 100
 
 
diff --git a/libavformat/version.h b/libavformat/version.h
index 0708d619c0..b234218b10 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
 
 #include "version_major.h"
 
-#define LIBAVFORMAT_VERSION_MINOR  26
+#define LIBAVFORMAT_VERSION_MINOR  27
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
diff --git a/libavutil/version.h b/libavutil/version.h
index 2e9e02dda8..87178e9e9a 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -79,7 +79,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  57
-#define LIBAVUTIL_VERSION_MINOR  27
+#define LIBAVUTIL_VERSION_MINOR  28
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
diff --git a/libpostproc/version.h b/libpostproc/version.h
index 833351cb0e..397f3f74a7 100644
--- a/libpostproc/version.h
+++ b/libpostproc/version.h
@@ -30,7 +30,7 @@
 
 #include "version_major.h"
 
-#define LIBPOSTPROC_VERSION_MINOR   5
+#define LIBPOSTPROC_VERSION_MINOR   6
 #define LIBPOSTPROC_VERSION_MICRO 100
 
 #define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \
diff --git a/libswresample/version.h b/libswresample/version.h
index 334b6681e2..7e5c58ec87 100644
--- a/libswresample/version.h
+++ b/libswresample/version.h
@@ -30,7 +30,7 @@
 
 #include "version_major.h"
 
-#define LIBSWRESAMPLE_VERSION_MINOR   6
+#define LIBSWRESAMPLE_VERSION_MINOR   7
 #define LIBSWRESAMPLE_VERSION_MICRO 100
 
 #define LIBSWRESAMPLE_VERSION_INT  AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, 
\
diff --git a/libswscale/version.h b/libswscale/version.h
index f573bef6fc..4c6af261e6 100644
--- a/libswscale/version.h
+++ b/libswscale/version.h
@@ -28,7 +28,7 @@
 
 #include "version_major.h"
 
-#define LIBSWSCALE_VERSION_MINOR   6
+#define LIBSWSCALE_VERSION_MINOR   7
 #define LIBSWSCALE_VERSION_MICRO 100
 
 #define LIBSWSCALE_VERSION_INT  AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".