June 2015 - ffmpeg-cvslog - lists.ffmpeg.org

Merge commit '3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f'
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Jun 30 20:47:13 2015 +0200| [a9aed08fa4e94b19afe343b11e6eea117da5408a] | committer: Michael Niedermayer Merge commit '3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f' * commit '3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f': fate: Update ac3 test to the new request_channel_layout option Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a9aed08fa4e94b19a… ---

1 0

fate: Update ac3 test to the new request_channel_layout option
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Sat Jun 27 23:36:33 2015 +0200| [3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f] | committer: Vittorio Giovara fate: Update ac3 test to the new request_channel_layout option > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ad678a85b96fc5fe… --- tests/fate/ac3.mak | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/fate/ac3.mak b/tests/fate/ac3.mak index 3841240..fee4567 100644 --- a/tests/fate/ac3.mak +++ b/tests/fate/ac3.mak @@ -6,12 +6,14 @@ FATE_AC3 += fate-ac3-4.0 fate-ac3-4.0: CMD = pcm -i $(TARGET_SAMPLES)/ac3/millers_crossing_4.0.ac3 fate-ac3-4.0: REF = $(SAMPLES)/ac3/millers_crossing_4.0_v2.pcm +#request_channel_layout 4 -> front channel FATE_AC3 += fate-ac3-4.0-downmix-mono -fate-ac3-4.0-downmix-mono: CMD = pcm -request_channels 1 -i $(TARGET_SAMPLES)/ac3/millers_crossing_4.0.ac3 +fate-ac3-4.0-downmix-mono: CMD = pcm -request_channel_layout 4 -i $(TARGET_SAMPLES)/ac3/millers_crossing_4.0.ac3 fate-ac3-4.0-downmix-mono: REF = $(SAMPLES)/ac3/millers_crossing_4.0_mono_v2.pcm +#request_channel_layout 3 -> left channel + right channel FATE_AC3 += fate-ac3-4.0-downmix-stereo -fate-ac3-4.0-downmix-stereo: CMD = pcm -request_channels 2 -i $(TARGET_SAMPLES)/ac3/millers_crossing_4.0.ac3 +fate-ac3-4.0-downmix-stereo: CMD = pcm -request_channel_layout 3 -i $(TARGET_SAMPLES)/ac3/millers_crossing_4.0.ac3 fate-ac3-4.0-downmix-stereo: REF = $(SAMPLES)/ac3/millers_crossing_4.0_stereo_v2.pcm FATE_AC3 += fate-ac3-5.1 @@ -19,11 +21,11 @@ fate-ac3-5.1: CMD = pcm -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 fate-ac3-5.1: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small_v2.pcm FATE_AC3 += fate-ac3-5.1-downmix-mono -fate-ac3-5.1-downmix-mono: CMD = pcm -request_channels 1 -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 +fate-ac3-5.1-downmix-mono: CMD = pcm -request_channel_layout 4 -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 fate-ac3-5.1-downmix-mono: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small_mono_v2.pcm FATE_AC3 += fate-ac3-5.1-downmix-stereo -fate-ac3-5.1-downmix-stereo: CMD = pcm -request_channels 2 -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 +fate-ac3-5.1-downmix-stereo: CMD = pcm -request_channel_layout 3 -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 fate-ac3-5.1-downmix-stereo: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small_stereo_v2.pcm FATE_EAC3 += fate-eac3-1

1 0

avcodec/h264_slice: Use w/h from the AVFrame instead of mb_w/h
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Jun 30 19:37:12 2015 +0200| [330863c9f19a23c500ba7901a23f1cc377b353bb] | committer: Michael Niedermayer avcodec/h264_slice: Use w/h from the AVFrame instead of mb_w/h Fixes out of array access Fixes: asan_heap-oob_4d5bb0_682_cov_3124593265_Fraunhofer__a_driving_force_in_innovation__small.mp4 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=330863c9f19a23c50… --- libavcodec/h264_slice.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index f755b96..35ef7bf 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1579,8 +1579,8 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) (const uint8_t **)prev->f->data, prev->f->linesize, prev->f->format, - h->mb_width * 16, - h->mb_height * 16); + prev->f->width, + prev->f->height); h->short_ref[0]->poc = prev->poc + 2; } h->short_ref[0]->frame_num = h->prev_frame_num;

1 0

avfilter/vf_transpose: Fix rounding error
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Jun 30 16:01:15 2015 +0200| [0083c16605aa5997534e87e68f97ef85a8c3b7b8] | committer: Michael Niedermayer avfilter/vf_transpose: Fix rounding error Fixes out of array access Fixes: asan_heap-oob_7f875d_3482_cov_1818465256_ssudec.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0083c16605aa59975… --- libavfilter/vf_transpose.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c index 911329c..e4de31b 100644 --- a/libavfilter/vf_transpose.c +++ b/libavfilter/vf_transpose.c @@ -151,7 +151,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int hsub = plane == 1 || plane == 2 ? trans->hsub : 0; int vsub = plane == 1 || plane == 2 ? trans->vsub : 0; int pixstep = trans->pixsteps[plane]; - int inh = in->height >> vsub; + int inh = FF_CEIL_RSHIFT(in->height, vsub); int outw = FF_CEIL_RSHIFT(out->width, hsub); int outh = FF_CEIL_RSHIFT(out->height, vsub); int start = (outh * jobnr ) / nb_jobs;

1 0

configure: Mention hap encoding for --enable-libsnappy.
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Tue Jun 30 14:49:07 2015 +0200| [9295ee137ac91a9370435e5673820d8aa9d62cca] | committer: Carl Eugen Hoyos configure: Mention hap encoding for --enable-libsnappy. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9295ee137ac91a937… --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 6c1c290..89b5668 100755 --- a/configure +++ b/configure @@ -239,7 +239,7 @@ External library support: --enable-libschroedinger enable Dirac de/encoding via libschroedinger [no] --enable-libshine enable fixed-point MP3 encoding via libshine [no] --enable-libsmbclient enable Samba protocol via libsmbclient [no] - --enable-libsnappy enable Snappy compression [no] + --enable-libsnappy enable Snappy compression, needed for hap encoding [no] --enable-libsoxr enable Include libsoxr resampling [no] --enable-libspeex enable Speex de/encoding via libspeex [no] --enable-libssh enable SFTP protocol via libssh [no]

1 0

lavc/j2kenc: Make jp2 output compatible with Kakadu.
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Tue Jun 30 14:42:31 2015 +0200| [0f5b99653120ca6d75cb668ff6cc5685dbda345c] | committer: Michael Niedermayer lavc/j2kenc: Make jp2 output compatible with Kakadu. Fixes ticket #4689. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f5b99653120ca6d7… --- libavcodec/j2kenc.c | 1 + tests/ref/vsynth/vsynth1-jpeg2000 | 4 ++-- tests/ref/vsynth/vsynth1-jpeg2000-97 | 4 ++-- tests/ref/vsynth/vsynth2-jpeg2000 | 4 ++-- tests/ref/vsynth/vsynth2-jpeg2000-97 | 4 ++-- tests/ref/vsynth/vsynth3-jpeg2000 | 4 ++-- tests/ref/vsynth/vsynth3-jpeg2000-97 | 4 ++-- tests/ref/vsynth/vsynth_lena-jpeg2000 | 4 ++-- tests/ref/vsynth/vsynth_lena-jpeg2000-97 | 4 ++-- 9 files changed, 17 insertions(+), 16 deletions(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index acfa5a0..6d7b3f7 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -982,6 +982,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, bytestream_put_buffer(&s->buf, "ftyp", 4); bytestream_put_buffer(&s->buf, "jp2\040\040", 4); bytestream_put_be32(&s->buf, 0); + bytestream_put_buffer(&s->buf, "jp2\040", 4); update_size(chunkstart, s->buf); jp2hstart = s->buf; diff --git a/tests/ref/vsynth/vsynth1-jpeg2000 b/tests/ref/vsynth/vsynth1-jpeg2000 index 2f7ea3c..48accf5 100644 --- a/tests/ref/vsynth/vsynth1-jpeg2000 +++ b/tests/ref/vsynth/vsynth1-jpeg2000 @@ -1,4 +1,4 @@ -c742e656f20e6f4dfcf39d3c00a4d78c *tests/data/fate/vsynth1-jpeg2000.avi -2265498 tests/data/fate/vsynth1-jpeg2000.avi +d2a06ad916711d29b30977a06335bb76 *tests/data/fate/vsynth1-jpeg2000.avi +2265698 tests/data/fate/vsynth1-jpeg2000.avi 15a8e49f6fd014193bbafd72f84936c7 *tests/data/fate/vsynth1-jpeg2000.out.rawvideo stddev: 5.36 PSNR: 33.55 MAXDIFF: 61 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-jpeg2000-97 b/tests/ref/vsynth/vsynth1-jpeg2000-97 index 32c8a52..33b3299 100644 --- a/tests/ref/vsynth/vsynth1-jpeg2000-97 +++ b/tests/ref/vsynth/vsynth1-jpeg2000-97 @@ -1,4 +1,4 @@ -a19cc0e1a1c1bf76ff5a0b63a0bdfbd1 *tests/data/fate/vsynth1-jpeg2000-97.avi -3654420 tests/data/fate/vsynth1-jpeg2000-97.avi +8bb707e596f97451fd325dec2dd610a7 *tests/data/fate/vsynth1-jpeg2000-97.avi +3654620 tests/data/fate/vsynth1-jpeg2000-97.avi 5073771a78e1f5366a7eb0df341662fc *tests/data/fate/vsynth1-jpeg2000-97.out.rawvideo stddev: 4.23 PSNR: 35.59 MAXDIFF: 53 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-jpeg2000 b/tests/ref/vsynth/vsynth2-jpeg2000 index 0a9df9b..094f416 100644 --- a/tests/ref/vsynth/vsynth2-jpeg2000 +++ b/tests/ref/vsynth/vsynth2-jpeg2000 @@ -1,4 +1,4 @@ -618d3b5c498a0fde4debce5235fcc334 *tests/data/fate/vsynth2-jpeg2000.avi -1494316 tests/data/fate/vsynth2-jpeg2000.avi +6c2f979e4a33a36f36aec86f2d464143 *tests/data/fate/vsynth2-jpeg2000.avi +1494516 tests/data/fate/vsynth2-jpeg2000.avi 36afd96d6e55bc83166fd615351ba366 *tests/data/fate/vsynth2-jpeg2000.out.rawvideo stddev: 5.00 PSNR: 34.15 MAXDIFF: 59 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-jpeg2000-97 b/tests/ref/vsynth/vsynth2-jpeg2000-97 index d325271..38153ea 100644 --- a/tests/ref/vsynth/vsynth2-jpeg2000-97 +++ b/tests/ref/vsynth/vsynth2-jpeg2000-97 @@ -1,4 +1,4 @@ -b86217f0bcbd84a9368ad3f98af32157 *tests/data/fate/vsynth2-jpeg2000-97.avi -2448506 tests/data/fate/vsynth2-jpeg2000-97.avi +2e43f004a55f4a55a19c4b79fc8e8743 *tests/data/fate/vsynth2-jpeg2000-97.avi +2448706 tests/data/fate/vsynth2-jpeg2000-97.avi a6e2453118a0de135836a868b2ca0e60 *tests/data/fate/vsynth2-jpeg2000-97.out.rawvideo stddev: 3.23 PSNR: 37.94 MAXDIFF: 29 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth3-jpeg2000 b/tests/ref/vsynth/vsynth3-jpeg2000 index 0f4c8f4..a1e3a80 100644 --- a/tests/ref/vsynth/vsynth3-jpeg2000 +++ b/tests/ref/vsynth/vsynth3-jpeg2000 @@ -1,4 +1,4 @@ -6a0f2a14f6b4628c8c51c360d7355093 *tests/data/fate/vsynth3-jpeg2000.avi -65348 tests/data/fate/vsynth3-jpeg2000.avi +0b8aa8113c10772cffff60f9c8ffd902 *tests/data/fate/vsynth3-jpeg2000.avi +65548 tests/data/fate/vsynth3-jpeg2000.avi 2d8bd94d558755c47d7e23fd9556e164 *tests/data/fate/vsynth3-jpeg2000.out.rawvideo stddev: 5.48 PSNR: 33.34 MAXDIFF: 47 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-jpeg2000-97 b/tests/ref/vsynth/vsynth3-jpeg2000-97 index 2c8b5ab..191956f 100644 --- a/tests/ref/vsynth/vsynth3-jpeg2000-97 +++ b/tests/ref/vsynth/vsynth3-jpeg2000-97 @@ -1,4 +1,4 @@ -5e17fdaae1a22f3eef8c82b512e4b1b9 *tests/data/fate/vsynth3-jpeg2000-97.avi -83670 tests/data/fate/vsynth3-jpeg2000-97.avi +b6c88a623c3296ca945346d2203f0af0 *tests/data/fate/vsynth3-jpeg2000-97.avi +83870 tests/data/fate/vsynth3-jpeg2000-97.avi 0cd707bfb1bbe5312b00c094f695b1fa *tests/data/fate/vsynth3-jpeg2000-97.out.rawvideo stddev: 4.52 PSNR: 35.02 MAXDIFF: 47 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth_lena-jpeg2000 b/tests/ref/vsynth/vsynth_lena-jpeg2000 index cbb25b4..72550eb 100644 --- a/tests/ref/vsynth/vsynth_lena-jpeg2000 +++ b/tests/ref/vsynth/vsynth_lena-jpeg2000 @@ -1,4 +1,4 @@ -90976c5b9539111b33a46b4c882a3cb0 *tests/data/fate/vsynth_lena-jpeg2000.avi -1137854 tests/data/fate/vsynth_lena-jpeg2000.avi +1f2cf6061c78905b8011091a9a7c425f *tests/data/fate/vsynth_lena-jpeg2000.avi +1138054 tests/data/fate/vsynth_lena-jpeg2000.avi 955653ca7a08447e7b1501b444f24562 *tests/data/fate/vsynth_lena-jpeg2000.out.rawvideo stddev: 4.40 PSNR: 35.25 MAXDIFF: 58 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-jpeg2000-97 b/tests/ref/vsynth/vsynth_lena-jpeg2000-97 index 194e9bf..5c12665 100644 --- a/tests/ref/vsynth/vsynth_lena-jpeg2000-97 +++ b/tests/ref/vsynth/vsynth_lena-jpeg2000-97 @@ -1,4 +1,4 @@ -ca78db12e1af7cbf44fdce165aaa5130 *tests/data/fate/vsynth_lena-jpeg2000-97.avi -1918756 tests/data/fate/vsynth_lena-jpeg2000-97.avi +e5a756e97910420c90e76259c56261cb *tests/data/fate/vsynth_lena-jpeg2000-97.avi +1918956 tests/data/fate/vsynth_lena-jpeg2000-97.avi 93a4ba0c230f2430a813df594676e58a *tests/data/fate/vsynth_lena-jpeg2000-97.out.rawvideo stddev: 2.84 PSNR: 39.04 MAXDIFF: 28 bytes: 7603200/ 7603200

1 0

doc: Add jpeg2000 encoder documentation.
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Tue Jun 30 14:42:14 2015 +0200| [e97ec65630d10d8eeeacdd2399bf68ca34eacab5] | committer: Michael Niedermayer doc: Add jpeg2000 encoder documentation. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e97ec65630d10d8ee… --- doc/encoders.texi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index 8fed2fc..5946644 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1342,6 +1342,21 @@ disabled A description of some of the currently available video encoders follows. +@section jpeg2000 + +The native jpeg 2000 encoder is lossy by default, the @code{-q:v} +option can be used to set the encoding quality. Lossless encoding +can be selected with @code{-pred 1}. + +@subsection Options + +@table @option +@item format +Can be set to either @code{j2k} or @code{jp2} (the default) that +allows to store non-rgb pix_fmts. + +@end table + @section libtheora libtheora Theora encoder wrapper.

1 0

lavc/hapenc: Silence a warning for multithreaded encoding.
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Tue Jun 30 14:34:56 2015 +0200| [8080688d0e3d771bb2930457cd64c0f01591e59b] | committer: Carl Eugen Hoyos lavc/hapenc: Silence a warning for multithreaded encoding. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8080688d0e3d771bb… --- libavcodec/hapdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/hapdec.c b/libavcodec/hapdec.c index 6e3c138..e6b7d61 100644 --- a/libavcodec/hapdec.c +++ b/libavcodec/hapdec.c @@ -177,7 +177,8 @@ static int hap_decode(AVCodecContext *avctx, void *data, ret = ff_thread_get_buffer(avctx, &tframe, 0); if (ret < 0) return ret; - ff_thread_finish_setup(avctx); + if (avctx->codec->update_thread_context) + ff_thread_finish_setup(avctx); /* Use the decompress function on the texture, one block per thread */ avctx->execute2(avctx, decompress_texture_thread, tframe.f, NULL, blocks);

1 0

avcodec/j2kenc: store libavcodec ident in a comment unless bitexact mode is used
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Jun 30 13:45:03 2015 +0200| [5c047f3ad49c8a8a5ae126d134b1004a4dcbc39b] | committer: Michael Niedermayer avcodec/j2kenc: store libavcodec ident in a comment unless bitexact mode is used Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c047f3ad49c8a8a5… --- libavcodec/j2kenc.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index dcdf411..acfa5a0 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -317,6 +317,26 @@ static int put_qcd(Jpeg2000EncoderContext *s, int compno) return 0; } +static int put_com(Jpeg2000EncoderContext *s, int compno) +{ + int i; + int size = 4 + strlen(LIBAVCODEC_IDENT); + + if (s->avctx->flags & CODEC_FLAG_BITEXACT) + return 0; + + if (s->buf_end - s->buf < size + 2) + return -1; + + bytestream_put_be16(&s->buf, JPEG2000_COM); + bytestream_put_be16(&s->buf, size); + bytestream_put_be16(&s->buf, 1); // General use (ISO/IEC 8859-15 (Latin) values) + + bytestream_put_buffer(&s->buf, LIBAVCODEC_IDENT, strlen(LIBAVCODEC_IDENT)); + + return 0; +} + static uint8_t *put_sot(Jpeg2000EncoderContext *s, int tileno) { uint8_t *psotptr; @@ -1010,6 +1030,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, return ret; if ((ret = put_qcd(s, 0)) < 0) return ret; + if ((ret = put_com(s, 0)) < 0) + return ret; for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++){ uint8_t *psotptr;

1 0

vp9/update_prob: prevent out of bounds table read
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | James Zern <jzern(a)google.com> | Mon Jun 29 23:03:14 2015 -0700| [e91f860ea74e11e9178500fe8794c47f57dbf48c] | committer: Michael Niedermayer vp9/update_prob: prevent out of bounds table read the max value of the lookup in expanded form is: (((1 << 7) - 1) << 1) - 65 + 1 + 64 = 254 add one entry of padding to inv_map_table[] to prevent out of bounds access with non-conforming / fuzzed bitstreams Signed-off-by: James Zern <jzern(a)google.com> Reviewed-by: "Ronald S. Bultje" <rsbultje(a)gmail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e91f860ea74e11e91… --- libavcodec/vp9.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 3ad9056..6888326 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -425,7 +425,7 @@ static av_always_inline int inv_recenter_nonneg(int v, int m) // differential forward probability updates static int update_prob(VP56RangeCoder *c, int p) { - static const int inv_map_table[254] = { + static const int inv_map_table[255] = { 7, 20, 33, 46, 59, 72, 85, 98, 111, 124, 137, 150, 163, 176, 189, 202, 215, 228, 241, 254, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 21, 22, 23, 24, @@ -444,7 +444,7 @@ static int update_prob(VP56RangeCoder *c, int p) 207, 208, 209, 210, 211, 212, 213, 214, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, - 252, 253, + 252, 253, 253, }; int d; @@ -474,6 +474,7 @@ static int update_prob(VP56RangeCoder *c, int p) if (d >= 65) d = (d << 1) - 65 + vp8_rac_get(c); d += 64; + av_assert2(d < FF_ARRAY_ELEMS(inv_map_table)); } return p <= 128 ? 1 + inv_recenter_nonneg(inv_map_table[d], p - 1) :

1 0