[FFmpeg-cvslog] lavc/h264_parse: Remove a superfluous linebreak.
ffmpeg | branch: master | Carl Eugen Hoyos | Tue May 22 12:48:53 2018 +0200| [15f50ccc6f3fb9358aa2d63b7ce8036764f197b0] | committer: Carl Eugen Hoyos lavc/h264_parse: Remove a superfluous linebreak. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15f50ccc6f3fb9358aa2d63b7ce8036764f197b0 --- libavcodec/h264_parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index 87e5b3cdc5..34ffe3b1fe 100644 --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@ -120,7 +120,7 @@ int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps, pwt->use_weight = pwt->use_weight || pwt->use_weight_chroma; return 0; out_range_weight: -avpriv_request_sample(logctx, "Out of range weight\n"); +avpriv_request_sample(logctx, "Out of range weight"); return AVERROR_INVALIDDATA; } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavc/jpeg2000dec: Move a variable declaration closer to its usage.
ffmpeg | branch: master | Carl Eugen Hoyos | Tue May 22
12:55:46 2018 +0200| [1083808c48cd58fe3b14dbfbbc3f46c2ae6c0352] | committer:
Carl Eugen Hoyos
lavc/jpeg2000dec: Move a variable declaration closer to its usage.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1083808c48cd58fe3b14dbfbbc3f46c2ae6c0352
---
libavcodec/jpeg2000dec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 5fa9b9de8f..66f11bb2b2 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -2053,7 +2053,6 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s)
}
} else if (atom2 == MKBETAG('p','c','l','r') && atom2_size >=
6) {
int i, size, colour_count, colour_channels,
colour_depth[3];
-uint32_t r, g, b;
colour_count = bytestream2_get_be16u(&s->g);
colour_channels = bytestream2_get_byteu(&s->g);
// FIXME: Do not ignore channel_sign
@@ -2075,6 +2074,7 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s)
}
s->pal8 = 1;
for (i = 0; i < colour_count; i++) {
+uint32_t r, g, b;
if (colour_depth[0] <= 8) {
r = bytestream2_get_byteu(&s->g) << 8 -
colour_depth[0];
r |= r >> colour_depth[0];
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavc/jpeg2000dec: Use a define to clarify the meaning of a constant.
ffmpeg | branch: master | Carl Eugen Hoyos | Tue May 22 12:54:32 2018 +0200| [848ce6f0a6075485720475ade0385a359f4700b5] | committer: Carl Eugen Hoyos lavc/jpeg2000dec: Use a define to clarify the meaning of a constant. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=848ce6f0a6075485720475ade0385a359f4700b5 --- libavcodec/jpeg2000dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 12dcc5c6f5..5fa9b9de8f 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2063,7 +2063,7 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s) size = (colour_depth[0] + 7 >> 3) * colour_count + (colour_depth[1] + 7 >> 3) * colour_count + (colour_depth[2] + 7 >> 3) * colour_count; -if (colour_count > 256 || +if (colour_count > AVPALETTE_COUNT || colour_channels != 3 || colour_depth[0] > 16 || colour_depth[1] > 16 || ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/bintext: Reduce detection for random .bin files as it more likely is not a multimedia related file
ffmpeg | branch: master | Michael Niedermayer | Sat May 12 18:33:26 2018 +0200| [919e37377a76f63d030d680fcb9506a3f8cc2d62] | committer: Michael Niedermayer avformat/bintext: Reduce detection for random .bin files as it more likely is not a multimedia related file Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=919e37377a76f63d030d680fcb9506a3f8cc2d62 --- libavformat/bintext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/bintext.c b/libavformat/bintext.c index f1c0b3e892..0b499d9555 100644 --- a/libavformat/bintext.c +++ b/libavformat/bintext.c @@ -163,7 +163,7 @@ static int bin_probe(AVProbeData *p) if (par.width * par.height * 2 / (8*16) == p->buf_size) return AVPROBE_SCORE_MAX / 2; -return 1; +return 0; } if (sauce) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/mov: replace a value error by clipping into valid range in mov_read_stsc()
ffmpeg | branch: master | Michael Niedermayer | Mon
May 21 03:16:58 2018 +0200| [fe84f70819d6f5aab3c4823290e0d32b99d6de78] |
committer: Michael Niedermayer
avformat/mov: replace a value error by clipping into valid range in
mov_read_stsc()
Fixes: #7165
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe84f70819d6f5aab3c4823290e0d32b99d6de78
---
libavformat/mov.c | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index a078bf4712..f2a540ad50 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2642,14 +2642,22 @@ static int mov_read_stsc(MOVContext *c, AVIOContext
*pb, MOVAtom atom)
sc->stsc_count = i;
for (i = sc->stsc_count - 1; i < UINT_MAX; i--) {
+int64_t first_min = i + 1;
if ((i+1 < sc->stsc_count && sc->stsc_data[i].first >=
sc->stsc_data[i+1].first) ||
(i > 0 && sc->stsc_data[i].first <= sc->stsc_data[i-1].first) ||
-sc->stsc_data[i].first < 1 ||
+sc->stsc_data[i].first < first_min ||
sc->stsc_data[i].count < 1 ||
sc->stsc_data[i].id < 1) {
av_log(c->fc, AV_LOG_WARNING, "STSC entry %d is invalid (first=%d
count=%d id=%d)\n", i, sc->stsc_data[i].first, sc->stsc_data[i].count,
sc->stsc_data[i].id);
-if (i+1 >= sc->stsc_count || sc->stsc_data[i+1].first < 2)
-return AVERROR_INVALIDDATA;
+if (i+1 >= sc->stsc_count) {
+sc->stsc_data[i].first = FFMAX(sc->stsc_data[i].first,
first_min);
+if (i > 0 && sc->stsc_data[i].first <=
sc->stsc_data[i-1].first)
+sc->stsc_data[i].first = FFMIN(sc->stsc_data[i-1].first +
1LL, INT_MAX);
+sc->stsc_data[i].count = FFMAX(sc->stsc_data[i].count, 1);
+sc->stsc_data[i].id= FFMAX(sc->stsc_data[i].id, 1);
+continue;
+}
+av_assert0(sc->stsc_data[i+1].first >= 2);
// We replace this entry by the next valid
sc->stsc_data[i].first = sc->stsc_data[i+1].first - 1;
sc->stsc_data[i].count = sc->stsc_data[i+1].count;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
