@@ -1,4 +1,9 @@

 -------------------------------------------------------------------

+Fri Oct 16 2015 - joerg.lorenzen@ki.tng.de

+

+- update internal ffmpeg to version 2.8.1

+

+-------------------------------------------------------------------

 Wed Sep 09 2015 - joerg.lorenzen@ki.tng.de

 - update internal ffmpeg to version 2.8

​

@@ -16,7 +16,7 @@

 #

-%define         ffmpeg_version 2.8

+%define         ffmpeg_version 2.8.1

 Name:           avidemux3

 Summary:        Graphical video editing and transcoding tool

​

@@ -1,6 +1,50 @@

 Entries are sorted chronologically from oldest to youngest within each release,

 releases are sorted from youngest to oldest.

+version 2.8.1:

+- swscale: fix ticket #4881

+- doc: fix spelling errors

+- hls: only seek if there is an offset

+- asfdec: add more checks for size left in asf packet buffer

+- asfdec: alloc enough space for storing name in asf_read_metadata_obj

+- avcodec/pngdec: Check blend_op.

+- h264_mp4toannexb: fix pps offfset fault when there are more than one sps in avcc

+- avcodec/h264_mp4toannexb_bsf: Use av_freep() to free spspps_buf

+- avformat/avidec: Workaround broken initial frame

+- avformat/hls: fix some cases of HLS streams which require cookies

+- avcodec/pngdec: reset has_trns after every decode_frame_png()

+- lavf/img2dec: Fix memory leak

+- avcodec/mp3: fix skipping zeros

+- avformat/srtdec: make sure we probe a number

+- configure: check for ID3D11VideoContext

+- avformat/vobsub: compare correct packet stream IDs

+- avformat/srtdec: more lenient first line probing

+- avformat/srtdec: fix number check for the first character

+- avcodec/mips: build fix for MSA 64bit

+- avcodec/mips: build fix for MSA

+- avformat/httpauth: Add space after commas in HTTP/RTSP auth header

+- libavformat/hlsenc: Use of uninitialized memory unlinking old files

+- avcodec/x86/sbrdsp: Fix using uninitialized upper 32bit of noise

+- avcodec/ffv1dec: Fix off by 1 error in quant_table_count check

+- avcodec/ffv1dec: Explicitly check read_quant_table() return value

+- dnxhddata: correct weight tables

+- dnxhddec: decode and use interlace mb flag

+- swscale: fix ticket #4877

+- avcodec/rangecoder: Check e

+- avcodec/ffv1: seperate slice_count from max_slice_count

+- swscale: fix ticket 4850

+- cmdutils: Filter dst/srcw/h

+- avutil/log: fix zero length gnu_printf format string warning

+- lavf/webvttenc: Require webvtt file to contain exactly one WebVTT stream.

+- swscale/swscale: Fix "unused variable" warning

+- avcodec/mjpegdec: Fix decoding RGBA RCT LJPEG

+- MAINTAINERS: add 2.8, drop 2.2

+- doc: mention libavcodec can decode Opus natively

+- hevc: properly handle no_rasl_output_flag when removing pictures from the DPB

+- avfilter/af_ladspa: process all channels for nb_handles > 1

+- configure: add libsoxr to swresample's pkgconfig

+- lavc: Fix compilation with --disable-everything --enable-parser=mpeg4video.

+

 version 2.8:

 - colorkey video filter

 - BFSTM/BCSTM demuxer

​

@@ -564,11 +564,11 @@

 Releases

 ========

+2.8                                     Michael Niedermayer

 2.7                                     Michael Niedermayer

 2.6                                     Michael Niedermayer

 2.5                                     Michael Niedermayer

 2.4                                     Michael Niedermayer

-2.2                                     Michael Niedermayer

 If you want to maintain an older release, please contact us

​

@@ -1,1 +1,1 @@

-2.8

+2.8.1

​

@@ -1,1 +1,1 @@

-2.8

+2.8.1

​

@@ -563,6 +563,12 @@

         struct SwsContext *sws = sws_alloc_context();

         int ret = av_opt_set(sws, opt, arg, 0);

         sws_freeContext(sws);

+        if (!strcmp(opt, "srcw") || !strcmp(opt, "srch") ||

+            !strcmp(opt, "dstw") || !strcmp(opt, "dsth") ||

+            !strcmp(opt, "src_format") || !strcmp(opt, "dst_format")) {

+            av_log(NULL, AV_LOG_ERROR, "Directly using swscale dimensions/format options is not supported, please use the -s or -pix_fmt options\n");

+            return AVERROR(EINVAL);

+        }

         if (ret < 0) {

             av_log(NULL, AV_LOG_ERROR, "Error setting option %s.\n", opt);

             return ret;

​

@@ -2374,7 +2374,7 @@

 # hardware accelerators

 crystalhd_deps="libcrystalhd_libcrystalhd_if_h"

-d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder"

+d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder ID3D11VideoContext"

 dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode"

 vaapi_deps="va_va_h"

 vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads CoreServices_CoreServices_h"

@@ -5147,6 +5147,7 @@

 check_type "windows.h dxva.h" "DXVA_PicParams_HEVC" -DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -D_CRT_BUILD_DESKTOP_APP=0

 check_type "windows.h d3d11.h" "ID3D11VideoDecoder"

+check_type "windows.h d3d11.h" "ID3D11VideoContext"

 check_type "d3d9.h dxva2api.h" DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0602

 check_type "va/va.h" "VAPictureParameterBufferHEVC"

@@ -5261,7 +5262,7 @@

 enabled libsmbclient      && { use_pkg_config smbclient libsmbclient.h smbc_init ||

                                require smbclient libsmbclient.h smbc_init -lsmbclient; }

 enabled libsnappy         && require snappy snappy-c.h snappy_compress -lsnappy

-enabled libsoxr           && require libsoxr soxr.h soxr_create -lsoxr

+enabled libsoxr           && require libsoxr soxr.h soxr_create -lsoxr && LIBSOXR="-lsoxr"

 enabled libssh            && require_pkg_config libssh libssh/sftp.h sftp_init

 enabled libspeex          && require_pkg_config speex speex/speex.h speex_decoder_init -lspeex

 enabled libstagefright_h264 && require_cpp libstagefright_h264 "binder/ProcessState.h media/stagefright/MetaData.h

@@ -6264,4 +6265,4 @@

 pkgconfig_generate libpostproc   "FFmpeg postprocessing library"        "$LIBPOSTPROC_VERSION"   ""

 pkgconfig_generate libavresample "Libav audio resampling library"       "$LIBAVRESAMPLE_VERSION" "$LIBM"

 pkgconfig_generate libswscale    "FFmpeg image rescaling library"       "$LIBSWSCALE_VERSION"    "$LIBM"

-pkgconfig_generate libswresample "FFmpeg audio resampling library"      "$LIBSWRESAMPLE_VERSION" "$LIBM"

+pkgconfig_generate libswresample "FFmpeg audio resampling library"      "$LIBSWRESAMPLE_VERSION" "$LIBM $LIBSOXR"

​

@@ -31,7 +31,7 @@

 # This could be handy for archiving the generated documentation or

 # if some version control system is used.

-PROJECT_NUMBER         = 2.8

+PROJECT_NUMBER         = 2.8.1

 # With the PROJECT_LOGO tag one can specify a logo or icon that is included

 # in the documentation. The maximum height of the logo should not exceed 55

​

@@ -1353,7 +1353,7 @@

 @table @option

 @item format

 Can be set to either @code{j2k} or @code{jp2} (the default) that

-allows to store non-rgb pix_fmts.

+makes it possible to store non-rgb pix_fmts.

 @end table

​

@@ -1032,7 +1032,7 @@

 For example full key look like this @code{lavfi.astats.1.DC_offset} or

 this @code{lavfi.astats.Overall.Peak_count}.

-For description what each key means read bellow.

+For description what each key means read below.

 @item reset

 Set number of frame after which stats are going to be recalculated.

@@ -2199,7 +2199,7 @@

 reduction starts. Default is 20. Range is between 0.01 and 2000.

 @item release

-Amount of milliseconds the signal has to fall bellow the threshold before

+Amount of milliseconds the signal has to fall below the threshold before

 reduction is decreased again. Default is 250. Range is between 0.01 and 9000.

 @item makeup

@@ -4118,7 +4118,7 @@

 @item threshold1

 @item threshold2

 @item threshold3

-Allows to limit the maximum change for each plane, default is 65535.

+Limit the maximum change for each plane, default is 65535.

 If 0, plane will remain unchanged.

 @end table

@@ -4321,7 +4321,7 @@

 @item threshold1

 @item threshold2

 @item threshold3

-Allows to limit the maximum change for each plane, default is 65535.

+Limit the maximum change for each plane, default is 65535.

 If 0, plane will remain unchanged.

 @item coordinates

@@ -5206,7 +5206,7 @@

 @item threshold1

 @item threshold2

 @item threshold3

-Allows to limit the maximum change for each plane, default is 65535.

+Limit the maximum change for each plane, default is 65535.

 If 0, plane will remain unchanged.

 @item coordinates

@@ -6900,7 +6900,7 @@

 @item threshold1

 @item threshold2

 @item threshold3

-Allows to limit the maximum change for each plane, default is 65535.

+Limit the maximum change for each plane, default is 65535.

 If 0, plane will remain unchanged.

 @end table

@@ -9881,7 +9881,7 @@

 @end example

 @item

-Convert input video from above bellow (left eye above, right eye below) to side by side crosseye.

+Convert input video from above below (left eye above, right eye below) to side by side crosseye.

 @example

 stereo3d=abl:sbsr

 @end example

​

@@ -983,8 +983,8 @@

 @item Musepack SV8           @tab     @tab  X

 @item Nellymoser Asao        @tab  X  @tab  X

 @item On2 AVC (Audio for Video Codec) @tab     @tab  X

-@item Opus                   @tab  E  @tab  E

-    @tab supported through external library libopus

+@item Opus                   @tab  E  @tab  X

+    @tab encoding supported through external library libopus

 @item PCM A-law              @tab  X  @tab  X

 @item PCM mu-law             @tab  X  @tab  X

 @item PCM signed 8-bit planar  @tab  X  @tab  X

​

@@ -861,7 +861,7 @@

 OBJS-$(CONFIG_MLP_PARSER)              += mlp_parser.o mlp.o

 OBJS-$(CONFIG_MPEG4VIDEO_PARSER)       += mpeg4video_parser.o h263.o \

                                           mpeg4videodec.o mpeg4video.o \

-                                          ituh263dec.o h263dec.o

+                                          ituh263dec.o h263dec.o h263data.o

 OBJS-$(CONFIG_PNG_PARSER)              += png_parser.o

 OBJS-$(CONFIG_MPEGAUDIO_PARSER)        += mpegaudio_parser.o \

                                           mpegaudiodecheader.o mpegaudiodata.o

​

@@ -48,7 +48,7 @@

     90, 90, 85, 79, 73, 73, 73, 73,

 };

-/* Used in CID 1237, 1253 */

+/* Used in CID 1237, 1253, 1259 */

 static const uint8_t dnxhd_1237_luma_weight[] = {

      0,  32,  33,  34, 34, 36, 37, 36,

     36,  37,  38,  38, 38, 39, 41, 44,

@@ -60,7 +60,7 @@

     97, 100, 104, 102, 98, 98, 99, 99,

 };

-/* Used in CID 1237, 1253 */

+/* Used in CID 1237, 1253, 1259 */

 static const uint8_t dnxhd_1237_chroma_weight[] = {

      0,  32,  36,  39, 39, 38, 39,  41,

     45,  51,  57,  58, 53, 48, 47,  51,

@@ -204,6 +204,7 @@

     61, 59, 59, 59, 61, 62, 62, 62,

 };

+/* Used in CID 1252, 1258 */

 static const uint8_t dnxhd_1252_luma_weight[] = {

       0,  32,  34, 35, 36, 36, 36, 37,

      36,  37,  39, 40, 41, 40, 40, 40,

@@ -214,6 +215,8 @@

      71,  82,  90, 90, 88, 87, 90, 95,

     100, 107, 103, 97, 95, 93, 99, 99,

 };

+

+/* Used in CID 1252, 1258 */

 static const uint8_t dnxhd_1252_chroma_weight[] = {

       0,  32,  35,  36,  37,  37,  38,  40,

      42,  46,  49,  50,  50,  49,  49,  53,

@@ -226,80 +229,36 @@

 };

 static const uint8_t dnxhd_1256_chroma_weight[] = {

-     0, 32, 32, 32, 32, 32, 32, 33,

-    32, 32, 32, 32, 32, 32, 32, 34,

-    32, 32, 32, 32, 32, 32, 33, 37,

-    32, 32, 32, 32, 32, 32, 36, 39,

-    32, 32, 32, 32, 32, 34, 39, 44,

-    32, 37, 32, 32, 35, 40, 43, 49,

-    32, 33, 36, 36, 40, 43, 50, 60,

-    34, 37, 39, 44, 51, 56, 61, 70,

-};

-

-static const uint8_t dnxhd_1258_luma_weight[] = {

-     0, 32, 36, 36,  40,  40, 55, 60,

-    34, 36, 37, 40,  41,  48, 57, 82,

-    35, 36, 41, 41,  46,  52, 73, 82,

-    37, 40, 42, 45,  50,  65, 80, 87,

-    39, 41, 44, 49,  62,  78, 88, 90,

-    41, 44, 49, 58,  73,  90, 95, 95,

-    43, 52, 55, 68,  90, 100, 97, 93,

-    52, 53, 71, 82, 107, 103, 99, 99,

-};

-

-static const uint8_t dnxhd_1258_chroma_weight[] = {

-     0, 32, 37,  38,  49,  53,  65,  66,

-    35, 37, 40,  49,  56,  64,  65,  82,

-    36, 42, 50,  56,  64,  67,  73,  85,

-    46, 50, 57,  63,  71,  72,  89,  87,

-    49, 58, 65,  72,  78,  88,  88,  90,

-    60, 64, 74,  81,  84,  90,  95, 134,

-    62, 74, 77,  80,  90, 114, 129, 125,

-    74, 74, 90, 100, 128, 125, 116, 116,

-};

-

-static const uint8_t dnxhd_1259_luma_weight[] = {

-     0, 32, 36, 37,  41,  44,  54, 60,

-    33, 34, 36, 39,  43,  51,  62, 78,

-    34, 36, 38, 41,  49,  59,  73, 79,

-    37, 38, 40, 47,  55,  66,  80, 95,

-    38, 41, 46, 54,  63,  79,  93, 96,

-    46, 47, 56, 64,  78,  90,  97, 98,

-    49, 58, 66, 78,  89,  97, 102, 98,

-    61, 65, 82, 87, 100, 104,  99, 99,

-};

-

-static const uint8_t dnxhd_1259_chroma_weight[] = {

-     0, 32, 38, 39,  47,  51,  77, 83,

-    36, 39, 41, 48,  55,  74,  85, 95,

-    39, 45, 53, 58,  72,  83, 105, 89,

-    51, 58, 66, 73,  82, 109,  92, 95,

-    57, 75, 78, 89, 105,  95,  93, 96,

-    81, 82, 99, 99,  94,  90,  97, 98,

-    83, 96, 97, 93,  89,  97, 102, 98,

-    90, 94, 92, 88, 100, 104,  99, 99,

+     0, 32, 32, 32, 32, 32, 32, 32,

+    32, 32, 32, 32, 32, 32, 32, 32,

+    32, 32, 32, 32, 32, 32, 37, 32,

+    32, 32, 32, 32, 33, 32, 32, 32,

+    32, 32, 33, 34, 37, 36, 32, 32,

+    32, 33, 34, 37, 36, 34, 35, 36,

+    39, 44, 40, 40, 39, 39, 44, 43,

+    43, 51, 56, 50, 49, 60, 61, 70,

 };

 static const uint8_t dnxhd_1260_luma_weight[] = {

-     0, 32, 37, 37, 40, 41, 52, 53,

-    33, 36, 36, 38, 40, 48, 49, 52,

-    34, 34, 37, 39, 44, 47, 49, 54,

-    33, 35, 38, 40, 45, 46, 54, 51,

-    34, 37, 37, 42, 44, 49, 52, 48,

-    34, 34, 38, 43, 44, 51, 50, 50,

-    33, 36, 41, 44, 51, 52, 50, 54,

-    36, 38, 44, 47, 53, 53, 54, 54,

+     0, 32, 33, 34, 36, 37, 37, 36,

+    34, 33, 34, 35, 37, 38, 40, 41,

+    40, 39, 38, 37, 34, 33, 34, 37,

+    40, 44, 48, 52, 53, 49, 47, 45,

+    42, 38, 36, 36, 38, 41, 43, 44,

+    46, 49, 52, 54, 54, 49, 44, 44,

+    44, 47, 51, 51, 52, 51, 48, 50,

+    52, 53, 53, 50, 50, 54, 54, 54,

 };

 static const uint8_t dnxhd_1260_chroma_weight[] = {

-     0, 32, 40, 38, 42, 40, 45, 45,

-    34, 42, 36, 43, 38, 46, 46, 49,

-    38, 35, 43, 39, 44, 47, 47, 49,

-    35, 42, 43, 42, 46, 47, 49, 52,

-    38, 43, 43, 44, 50, 49, 56, 50,

-    42, 43, 44, 50, 51, 57, 52, 53,

-    41, 45, 46, 53, 53, 56, 53, 54,

-    46, 46, 51, 49, 56, 53, 58, 58,

+     0, 32, 34, 38, 42, 40, 38, 36,

+    35, 35, 38, 42, 43, 43, 42, 40,

+    38, 39, 43, 43, 42, 41, 43, 43,

+    42, 44, 46, 45, 45, 46, 47, 46,

+    44, 44, 45, 46, 46, 46, 50, 50,

+    47, 47, 49, 49, 49, 49, 51, 53,

+    51, 49, 53, 57, 56, 52, 50, 52,

+    56, 56, 53, 53, 53, 54, 58, 58,

 };

 /* Used in CID 1235, 1241, 1250, 1256 */

@@ -1090,14 +1049,14 @@

       { 350, 390, 440, 730, 880 },

       { { 24000, 1001 }, { 25, 1 }, { 30000, 1001 }, { 50, 1 }, { 60000, 1001 } } },

     { 1258, 960, 720, 0, 212992, 212992, 4, 8, 5,

-      dnxhd_1258_luma_weight, dnxhd_1258_chroma_weight,

+      dnxhd_1252_luma_weight, dnxhd_1252_chroma_weight,

       dnxhd_1237_dc_codes, dnxhd_1237_dc_bits,

       dnxhd_1252_ac_codes, dnxhd_1252_ac_bits, dnxhd_1252_ac_level,

       dnxhd_1252_ac_flags,

       dnxhd_1250_run_codes, dnxhd_1250_run_bits, dnxhd_1250_run,

       { 42, 60, 75, 115 } },

     { 1259, 1440, 1080, 0, 417792, 417792, 4, 8, 3,

-      dnxhd_1259_luma_weight, dnxhd_1259_chroma_weight,

+      dnxhd_1237_luma_weight, dnxhd_1237_chroma_weight,

       dnxhd_1237_dc_codes, dnxhd_1237_dc_bits,

       dnxhd_1237_ac_codes, dnxhd_1237_ac_bits, dnxhd_1237_ac_level,

       dnxhd_1237_ac_flags,

​

@@ -349,7 +349,12 @@

     uint8_t *dest_y, *dest_u, *dest_v;

     int dct_y_offset, dct_x_offset;

     int qscale, i;

+    int interlaced_mb = 0;

+    if (ctx->cid_table->cid == 1260) {

+        interlaced_mb = get_bits1(&ctx->gb);

+        qscale = get_bits(&ctx->gb, 10);

+    } else

     qscale = get_bits(&ctx->gb, 11);

     skip_bits1(&ctx->gb);

@@ -386,8 +391,12 @@

         dest_u += frame->linesize[1];

         dest_v += frame->linesize[2];

     }

+    if (interlaced_mb) {

+        dct_linesize_luma   <<= 1;

+        dct_linesize_chroma <<= 1;

+    }

-    dct_y_offset = dct_linesize_luma << 3;

+    dct_y_offset = interlaced_mb ? frame->linesize[0] : (dct_linesize_luma << 3);

     dct_x_offset = 8 << shift1;

     if (!ctx->is_444) {

         ctx->idsp.idct_put(dest_y,                               dct_linesize_luma, ctx->blocks[0]);

@@ -396,7 +405,7 @@

         ctx->idsp.idct_put(dest_y + dct_y_offset + dct_x_offset, dct_linesize_luma, ctx->blocks[5]);

         if (!(ctx->avctx->flags & AV_CODEC_FLAG_GRAY)) {

-            dct_y_offset = dct_linesize_chroma << 3;

+            dct_y_offset = interlaced_mb ? frame->linesize[1] : (dct_linesize_chroma << 3);

             ctx->idsp.idct_put(dest_u,                dct_linesize_chroma, ctx->blocks[2]);

             ctx->idsp.idct_put(dest_v,                dct_linesize_chroma, ctx->blocks[3]);

             ctx->idsp.idct_put(dest_u + dct_y_offset, dct_linesize_chroma, ctx->blocks[6]);

@@ -409,7 +418,7 @@

         ctx->idsp.idct_put(dest_y + dct_y_offset + dct_x_offset, dct_linesize_luma, ctx->blocks[7]);

         if (!(ctx->avctx->flags & AV_CODEC_FLAG_GRAY)) {

-            dct_y_offset = dct_linesize_chroma << 3;

+            dct_y_offset = interlaced_mb ? frame->linesize[1] : (dct_linesize_chroma << 3);

             ctx->idsp.idct_put(dest_u,                               dct_linesize_chroma, ctx->blocks[2]);

             ctx->idsp.idct_put(dest_u + dct_x_offset,                dct_linesize_chroma, ctx->blocks[3]);

             ctx->idsp.idct_put(dest_u + dct_y_offset,                dct_linesize_chroma, ctx->blocks[8]);

​

@@ -101,7 +101,7 @@

 av_cold int ff_ffv1_init_slices_state(FFV1Context *f)

 {

     int i, ret;

-    for (i = 0; i < f->slice_count; i++) {

+    for (i = 0; i < f->max_slice_count; i++) {

         FFV1Context *fs = f->slice_context[i];

         if ((ret = ff_ffv1_init_slice_state(f, fs)) < 0)

             return AVERROR(ENOMEM);

@@ -113,10 +113,10 @@

 {

     int i;

-    f->slice_count = f->num_h_slices * f->num_v_slices;

-    av_assert0(f->slice_count > 0);

+    f->max_slice_count = f->num_h_slices * f->num_v_slices;

+    av_assert0(f->max_slice_count > 0);

-    for (i = 0; i < f->slice_count; i++) {

+    for (i = 0; i < f->max_slice_count; i++) {

         int sx          = i % f->num_h_slices;

         int sy          = i / f->num_h_slices;

         int sxs         = f->avctx->width  *  sx      / f->num_h_slices;

@@ -210,7 +210,7 @@

         ff_thread_release_buffer(avctx, &s->last_picture);

     av_frame_free(&s->last_picture.f);

-    for (j = 0; j < s->slice_count; j++) {

+    for (j = 0; j < s->max_slice_count; j++) {

         FFV1Context *fs = s->slice_context[j];

         for (i = 0; i < s->plane_count; i++) {

             PlaneContext *p = &fs->plane[i];

@@ -224,14 +224,14 @@

     av_freep(&avctx->stats_out);

     for (j = 0; j < s->quant_table_count; j++) {

         av_freep(&s->initial_states[j]);

-        for (i = 0; i < s->slice_count; i++) {

+        for (i = 0; i < s->max_slice_count; i++) {

             FFV1Context *sf = s->slice_context[i];

             av_freep(&sf->rc_stat2[j]);

         }

         av_freep(&s->rc_stat2[j]);

     }

-    for (i = 0; i < s->slice_count; i++)

+    for (i = 0; i < s->max_slice_count; i++)

         av_freep(&s->slice_context[i]);

     return 0;

​

@@ -118,6 +118,7 @@

     struct FFV1Context *slice_context[MAX_SLICES];

     int slice_count;

+    int max_slice_count;

     int num_v_slices;

     int num_h_slices;

     int slice_width;

​

@@ -47,8 +47,11 @@

     else {

         int i, e, a;

         e = 0;

-        while (get_rac(c, state + 1 + FFMIN(e, 9))) // 1..10

+        while (get_rac(c, state + 1 + FFMIN(e, 9))) { // 1..10

             e++;

+            if (e > 31)

+                return AVERROR_INVALIDDATA;

+        }

         a = 1;

         for (i = e - 1; i >= 0; i--)

@@ -302,7 +305,7 @@

     for (i = 0; i < f->plane_count; i++) {

         PlaneContext * const p = &fs->plane[i];

         int idx = get_symbol(c, state, 0);

-        if (idx > (unsigned)f->quant_table_count) {

+        if (idx >= (unsigned)f->quant_table_count) {

             av_log(f->avctx, AV_LOG_ERROR, "quant_table_index out of range\n");

             return -1;

         }

@@ -499,7 +502,10 @@

     int context_count = 1;

     for (i = 0; i < 5; i++) {

-        context_count *= read_quant_table(c, quant_table[i], context_count);

+        int ret = read_quant_table(c, quant_table[i], context_count);

+        if (ret < 0)

+            return ret;

+        context_count *= ret;

         if (context_count > 32768U) {

             return AVERROR_INVALIDDATA;

         }

@@ -775,6 +781,7 @@

             av_log(f->avctx, AV_LOG_ERROR, "read_quant_table error\n");

             return AVERROR_INVALIDDATA;

         }

+        f->slice_count = f->max_slice_count;

     } else if (f->version < 3) {

         f->slice_count = get_symbol(c, state, 0);

     } else {

@@ -789,8 +796,8 @@

             p -= size + trailer;

         }

     }

-    if (f->slice_count > (unsigned)MAX_SLICES || f->slice_count <= 0) {

-        av_log(f->avctx, AV_LOG_ERROR, "slice count %d is invalid\n", f->slice_count);

+    if (f->slice_count > (unsigned)MAX_SLICES || f->slice_count <= 0 || f->slice_count > f->max_slice_count) {

+        av_log(f->avctx, AV_LOG_ERROR, "slice count %d is invalid (max=%d)\n", f->slice_count, f->max_slice_count);

         return AVERROR_INVALIDDATA;

     }

@@ -1016,6 +1023,7 @@

     f->picture.f      = NULL;

     f->last_picture.f = NULL;

     f->sample_buffer  = NULL;

+    f->max_slice_count = 0;

     f->slice_count = 0;

     for (i = 0; i < f->quant_table_count; i++) {

@@ -1091,7 +1099,7 @@

         av_assert0(!fdst->sample_buffer);

     }

-    av_assert1(fdst->slice_count == fsrc->slice_count);

+    av_assert1(fdst->max_slice_count == fsrc->max_slice_count);

     ff_thread_release_buffer(dst, &fdst->picture);

​

@@ -977,6 +977,7 @@

     if ((ret = ff_ffv1_init_slice_contexts(s)) < 0)

         return ret;

+    s->slice_count = s->max_slice_count;

     if ((ret = ff_ffv1_init_slices_state(s)) < 0)

         return ret;

@@ -986,7 +987,7 @@

         if (!avctx->stats_out)

             return AVERROR(ENOMEM);

         for (i = 0; i < s->quant_table_count; i++)

-            for (j = 0; j < s->slice_count; j++) {

+            for (j = 0; j < s->max_slice_count; j++) {

                 FFV1Context *sf = s->slice_context[j];

                 av_assert0(!sf->rc_stat2[i]);

                 sf->rc_stat2[i] = av_mallocz(s->context_count[i] *

@@ -1210,6 +1211,7 @@

             for (i = 0; i < f->quant_table_count; i++)

                 memset(f->rc_stat2[i], 0, f->context_count[i] * sizeof(*f->rc_stat2[i]));

+            av_assert0(f->slice_count == f->max_slice_count);

             for (j = 0; j < f->slice_count; j++) {

                 FFV1Context *fs = f->slice_context[j];

                 for (i = 0; i < 256; i++) {

​

@@ -32,7 +32,7 @@

 /**

  * G.726 11bit float.

- * G.726 Standard uses rather odd 11bit floating point arithmentic for

+ * G.726 Standard uses rather odd 11bit floating point arithmetic for

  * numerous occasions. It's a mystery to me why they did it this way

  * instead of simply using 32bit integer arithmetic.

  */

​

@@ -122,7 +122,7 @@

         if (!unit_nb && !sps_done++) {

             unit_nb = *extradata++; /* number of pps unit(s) */

             if (unit_nb) {

-                ctx->pps_offset = (extradata - 1) - (avctx->extradata + 4);

+                ctx->pps_offset = total_size;

                 pps_seen = 1;

             }

         }

@@ -276,7 +276,7 @@

 {

     H264BSFContext *ctx = bsfc->priv_data;

     if (ctx->private_spspps)

-        av_free(ctx->spspps_buf);

+        av_freep(&ctx->spspps_buf);

 }

 AVBitStreamFilter ff_h264_mp4toannexb_bsf = {

​

@@ -809,6 +809,8 @@

     s->HEVClc->tu.cu_qp_offset_cb = 0;

     s->HEVClc->tu.cu_qp_offset_cr = 0;

+    s->no_rasl_output_flag = IS_IDR(s) || IS_BLA(s) || (s->nal_unit_type == NAL_CRA_NUT && s->last_eos);

+

     return 0;

 }

@@ -3135,6 +3137,7 @@

     s->pocTid0    = s0->pocTid0;

     s->max_ra     = s0->max_ra;

     s->eos        = s0->eos;

+    s->no_rasl_output_flag = s0->no_rasl_output_flag;

     s->is_nalff        = s0->is_nalff;

     s->nal_length_size = s0->nal_length_size;

@@ -3239,6 +3242,7 @@

     s->enable_parallel_tiles = 0;

     s->picture_struct = 0;

+    s->eos = 1;

     if(avctx->active_thread_type & FF_THREAD_SLICE)

         s->threads_number = avctx->thread_count;

@@ -3280,6 +3284,7 @@

     HEVCContext *s = avctx->priv_data;

     ff_hevc_flush_dpb(s);

     s->max_ra = INT_MAX;

+    s->eos = 1;

 }

 #define OFFSET(x) offsetof(HEVCContext, x)

​

@@ -866,6 +866,7 @@

     int bs_height;

     int is_decoded;

+    int no_rasl_output_flag;

     HEVCPredContext hpc;

     HEVCDSPContext hevcdsp;

​

@@ -174,7 +174,7 @@

         int min_poc   = INT_MAX;

         int i, min_idx, ret;

-        if (s->sh.no_output_of_prior_pics_flag == 1) {

+        if (s->sh.no_output_of_prior_pics_flag == 1 && s->no_rasl_output_flag == 1) {

             for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {

                 HEVCFrame *frame = &s->DPB[i];

                 if (!(frame->flags & HEVC_FRAME_FLAG_BUMPING) && frame->poc != s->poc &&

​

@@ -1915,24 +1915,24 @@

     v16u8 vec0;

     HEVCLocalContext *lc = s->HEVClc;

     int i;

-    int hshift = s->sps->hshift[c_idx];

-    int vshift = s->sps->vshift[c_idx];

+    int hshift = s->ps.sps->hshift[c_idx];

+    int vshift = s->ps.sps->vshift[c_idx];

     int size_in_luma_h = 16 << hshift;

-    int size_in_tbs_h = size_in_luma_h >> s->sps->log2_min_tb_size;

+    int size_in_tbs_h = size_in_luma_h >> s->ps.sps->log2_min_tb_size;

     int size_in_luma_v = 16 << vshift;

-    int size_in_tbs_v = size_in_luma_v >> s->sps->log2_min_tb_size;

+    int size_in_tbs_v = size_in_luma_v >> s->ps.sps->log2_min_tb_size;

     int x = x0 >> hshift;

     int y = y0 >> vshift;

-    int x_tb = (x0 >> s->sps->log2_min_tb_size) & s->sps->tb_mask;

-    int y_tb = (y0 >> s->sps->log2_min_tb_size) & s->sps->tb_mask;

+    int x_tb = (x0 >> s->ps.sps->log2_min_tb_size) & s->ps.sps->tb_mask;

+    int y_tb = (y0 >> s->ps.sps->log2_min_tb_size) & s->ps.sps->tb_mask;

     int cur_tb_addr =

-        s->pps->min_tb_addr_zs[(y_tb) * (s->sps->tb_mask + 2) + (x_tb)];

+        s->ps.pps->min_tb_addr_zs[(y_tb) * (s->ps.sps->tb_mask + 2) + (x_tb)];

     ptrdiff_t stride = s->frame->linesize[c_idx] / sizeof(uint8_t);

     uint8_t *src = (uint8_t *) s->frame->data[c_idx] + x + y * stride;

-    int min_pu_width = s->sps->min_pu_width;

+    int min_pu_width = s->ps.sps->min_pu_width;

     enum IntraPredMode mode = c_idx ? lc->tu.intra_pred_mode_c :

         lc->tu.intra_pred_mode;

@@ -1948,41 +1948,41 @@

     uint8_t *filtered_top = filtered_top_array + 1;

     int cand_bottom_left = lc->na.cand_bottom_left

         && cur_tb_addr >

-        s->pps->min_tb_addr_zs[((y_tb + size_in_tbs_v) & s->sps->tb_mask) *

-                               (s->sps->tb_mask + 2) + (x_tb - 1)];

+        s->ps.pps->min_tb_addr_zs[((y_tb + size_in_tbs_v) & s->ps.sps->tb_mask) *

+                               (s->ps.sps->tb_mask + 2) + (x_tb - 1)];

     int cand_left = lc->na.cand_left;

     int cand_up_left = lc->na.cand_up_left;

     int cand_up = lc->na.cand_up;

     int cand_up_right = lc->na.cand_up_right

         && cur_tb_addr >

-        s->pps->min_tb_addr_zs[(y_tb - 1) * (s->sps->tb_mask + 2) +

-                               ((x_tb + size_in_tbs_h) & s->sps->tb_mask)];

+        s->ps.pps->min_tb_addr_zs[(y_tb - 1) * (s->ps.sps->tb_mask + 2) +

+                               ((x_tb + size_in_tbs_h) & s->ps.sps->tb_mask)];

     int bottom_left_size =

         (((y0 + 2 * size_in_luma_v) >

-          (s->sps->height) ? (s->sps->height) : (y0 +

+          (s->ps.sps->height) ? (s->ps.sps->height) : (y0 +

                                                  2 * size_in_luma_v)) -

          (y0 + size_in_luma_v)) >> vshift;

     int top_right_size =

         (((x0 + 2 * size_in_luma_h) >

-          (s->sps->width) ? (s->sps->width) : (x0 + 2 * size_in_luma_h)) -

+          (s->ps.sps->width) ? (s->ps.sps->width) : (x0 + 2 * size_in_luma_h)) -

          (x0 + size_in_luma_h)) >> hshift;

-    if (s->pps->constrained_intra_pred_flag == 1) {

-        int size_in_luma_pu_v = ((size_in_luma_v) >> s->sps->log2_min_pu_size);

-        int size_in_luma_pu_h = ((size_in_luma_h) >> s->sps->log2_min_pu_size);

-        int on_pu_edge_x = !(x0 & ((1 << s->sps->log2_min_pu_size) - 1));

-        int on_pu_edge_y = !(y0 & ((1 << s->sps->log2_min_pu_size) - 1));

+    if (s->ps.pps->constrained_intra_pred_flag == 1) {

+        int size_in_luma_pu_v = ((size_in_luma_v) >> s->ps.sps->log2_min_pu_size);

+        int size_in_luma_pu_h = ((size_in_luma_h) >> s->ps.sps->log2_min_pu_size);

+        int on_pu_edge_x = !(x0 & ((1 << s->ps.sps->log2_min_pu_size) - 1));

+        int on_pu_edge_y = !(y0 & ((1 << s->ps.sps->log2_min_pu_size) - 1));

         if (!size_in_luma_pu_h)

             size_in_luma_pu_h++;

         if (cand_bottom_left == 1 && on_pu_edge_x) {

-            int x_left_pu = ((x0 - 1) >> s->sps->log2_min_pu_size);

+            int x_left_pu = ((x0 - 1) >> s->ps.sps->log2_min_pu_size);

             int y_bottom_pu =

-                ((y0 + size_in_luma_v) >> s->sps->log2_min_pu_size);

+                ((y0 + size_in_luma_v) >> s->ps.sps->log2_min_pu_size);

             int max =

                 ((size_in_luma_pu_v) >

-                 (s->sps->min_pu_height -

-                  y_bottom_pu) ? (s->sps->min_pu_height -

+                 (s->ps.sps->min_pu_height -

+                  y_bottom_pu) ? (s->ps.sps->min_pu_height -

                                   y_bottom_pu) : (size_in_luma_pu_v));

             cand_bottom_left = 0;

             for (i = 0; i < max; i += 2)

@@ -1993,12 +1993,12 @@

                      PF_INTRA);

         }

         if (cand_left == 1 && on_pu_edge_x) {

-            int x_left_pu = ((x0 - 1) >> s->sps->log2_min_pu_size);

-            int y_left_pu = ((y0) >> s->sps->log2_min_pu_size);

+            int x_left_pu = ((x0 - 1) >> s->ps.sps->log2_min_pu_size);

+            int y_left_pu = ((y0) >> s->ps.sps->log2_min_pu_size);

             int max =

                 ((size_in_luma_pu_v) >

-                 (s->sps->min_pu_height -

-                  y_left_pu) ? (s->sps->min_pu_height -

+                 (s->ps.sps->min_pu_height -

+                  y_left_pu) ? (s->ps.sps->min_pu_height -

                                 y_left_pu) : (size_in_luma_pu_v));

             cand_left = 0;

             for (i = 0; i < max; i += 2)

@@ -2009,20 +2009,20 @@

                      PF_INTRA);

         }

         if (cand_up_left == 1) {

-            int x_left_pu = ((x0 - 1) >> s->sps->log2_min_pu_size);

-            int y_top_pu = ((y0 - 1) >> s->sps->log2_min_pu_size);

+            int x_left_pu = ((x0 - 1) >> s->ps.sps->log2_min_pu_size);

+            int y_top_pu = ((y0 - 1) >> s->ps.sps->log2_min_pu_size);

             cand_up_left =

                 (s->ref->tab_mvf[(x_left_pu) +

                                  (y_top_pu) * min_pu_width]).pred_flag ==

                 PF_INTRA;

         }

         if (cand_up == 1 && on_pu_edge_y) {

-            int x_top_pu = ((x0) >> s->sps->log2_min_pu_size);

-            int y_top_pu = ((y0 - 1) >> s->sps->log2_min_pu_size);

+            int x_top_pu = ((x0) >> s->ps.sps->log2_min_pu_size);

+            int y_top_pu = ((y0 - 1) >> s->ps.sps->log2_min_pu_size);

             int max =

                 ((size_in_luma_pu_h) >

-                 (s->sps->min_pu_width -

-                  x_top_pu) ? (s->sps->min_pu_width -

+                 (s->ps.sps->min_pu_width -

+                  x_top_pu) ? (s->ps.sps->min_pu_width -

                                x_top_pu) : (size_in_luma_pu_h));

             cand_up = 0;

             for (i = 0; i < max; i += 2)

@@ -2032,13 +2032,13 @@

                                       min_pu_width]).pred_flag == PF_INTRA);

         }

         if (cand_up_right == 1 && on_pu_edge_y) {

-            int y_top_pu = ((y0 - 1) >> s->sps->log2_min_pu_size);

+            int y_top_pu = ((y0 - 1) >> s->ps.sps->log2_min_pu_size);

             int x_right_pu =

-                ((x0 + size_in_luma_h) >> s->sps->log2_min_pu_size);

+                ((x0 + size_in_luma_h) >> s->ps.sps->log2_min_pu_size);

             int max =

                 ((size_in_luma_pu_h) >

-                 (s->sps->min_pu_width -

-                  x_right_pu) ? (s->sps->min_pu_width -

+                 (s->ps.sps->min_pu_width -

+                  x_right_pu) ? (s->ps.sps->min_pu_width -

                                  x_right_pu) : (size_in_luma_pu_h));

             cand_up_right = 0;

             for (i = 0; i < max; i += 2)

@@ -2093,56 +2093,56 @@

         } while (0);

     }

-    if (s->pps->constrained_intra_pred_flag == 1) {

+    if (s->ps.pps->constrained_intra_pred_flag == 1) {

         if (cand_bottom_left || cand_left || cand_up_left || cand_up

             || cand_up_right) {

             int size_max_x =

                 x0 + ((2 * 16) << hshift) <

-                s->sps->width ? 2 * 16 : (s->sps->width - x0) >> hshift;

+                s->ps.sps->width ? 2 * 16 : (s->ps.sps->width - x0) >> hshift;

             int size_max_y =

                 y0 + ((2 * 16) << vshift) <

-                s->sps->height ? 2 * 16 : (s->sps->height - y0) >> vshift;

+                s->ps.sps->height ? 2 * 16 : (s->ps.sps->height - y0) >> vshift;

             int j = 16 + (cand_bottom_left ? bottom_left_size : 0) - 1;

             if (!cand_up_right) {

-                size_max_x = x0 + ((16) << hshift) < s->sps->width ?

-                    16 : (s->sps->width - x0) >> hshift;

+                size_max_x = x0 + ((16) << hshift) < s->ps.sps->width ?

+                    16 : (s->ps.sps->width - x0) >> hshift;

             }

             if (!cand_bottom_left) {

-                size_max_y = y0 + ((16) << vshift) < s->sps->height ?

-                    16 : (s->sps->height - y0) >> vshift;

+                size_max_y = y0 + ((16) << vshift) < s->ps.sps->height ?

+                    16 : (s->ps.sps->height - y0) >> vshift;

             }

             if (cand_bottom_left || cand_left || cand_up_left) {

                 while (j > -1

                        &&

                        !((s->ref->tab_mvf[(((x0 +

-                                             ((-1) << hshift)) >> s->sps->

+                                             ((-1) << hshift)) >> s->ps.sps->

                                             log2_min_pu_size)) + (((y0 +

                                                                     ((j) <<

                                                                      vshift))

-                                                                   >> s->sps->

+                                                                   >> s->ps.sps->

                                                                    log2_min_pu_size))

                                           * min_pu_width]).pred_flag ==

                          PF_INTRA))

                     j--;

                 if (!

                     ((s->ref->tab_mvf[(((x0 +

-                                         ((-1) << hshift)) >> s->sps->

+                                         ((-1) << hshift)) >> s->ps.sps->

                                         log2_min_pu_size)) + (((y0 + ((j)

                                                                       <<

                                                                       vshift))

-                                                               >> s->sps->

+                                                               >> s->ps.sps->

                                                                log2_min_pu_size))

                                       * min_pu_width]).pred_flag == PF_INTRA)) {

                     j = 0;

                     while (j < size_max_x

                            &&

                            !((s->ref->tab_mvf[(((x0 +

-                                                 ((j) << hshift)) >> s->sps->

+                                                 ((j) << hshift)) >> s->ps.sps->

                                                 log2_min_pu_size)) + (((y0 +

                                                                         ((-1) <<

                                                                          vshift))

                                                                        >> s->

-                                                                       sps->

+                                                                       ps.sps->

                                                                        log2_min_pu_size))

                                               * min_pu_width]).pred_flag ==

                              PF_INTRA))

@@ -2151,12 +2151,12 @@

                         if (!

                             ((s->ref->tab_mvf[(((x0 +

                                                  ((i -

-                                                   1) << hshift)) >> s->sps->

+                                                   1) << hshift)) >> s->ps.sps->

                                                 log2_min_pu_size)) + (((y0 +

                                                                         ((-1) <<

                                                                          vshift))

                                                                        >> s->

-                                                                       sps->

+                                                                       ps.sps->

                                                                        log2_min_pu_size))

                                               * min_pu_width]).pred_flag ==

                              PF_INTRA))

@@ -2168,11 +2168,11 @@

                 while (j < size_max_x

                        &&

                        !((s->ref->tab_mvf[(((x0 +

-                                             ((j) << hshift)) >> s->sps->

+                                             ((j) << hshift)) >> s->ps.sps->

                                             log2_min_pu_size)) + (((y0 + ((-1)

                                                                           <<

                                                                           vshift))

-                                                                   >> s->sps->

+                                                                   >> s->ps.sps->

                                                                    log2_min_pu_size))

                                           * min_pu_width]).pred_flag ==

                          PF_INTRA))

@@ -2184,11 +2184,11 @@

                                 ((s->ref->tab_mvf[(((x0 +

                                                      ((i -

                                                        1) << hshift)) >>

-                                                    s->sps->log2_min_pu_size))

+                                                    s->ps.sps->log2_min_pu_size))

                                                   + (((y0 + ((-1)

                                                              << vshift))

                                                       >>

-                                                      s->sps->log2_min_pu_size))

+                                                      s->ps.sps->log2_min_pu_size))

                                                   *

                                                   min_pu_width]).pred_flag ==

                                  PF_INTRA))

@@ -2199,11 +2199,11 @@

                                 ((s->ref->tab_mvf[(((x0 +

                                                      ((i -

                                                        1) << hshift)) >>

-                                                    s->sps->log2_min_pu_size))

+                                                    s->ps.sps->log2_min_pu_size))

                                                   + (((y0 + ((-1)

                                                              << vshift))

                                                       >>

-                                                      s->sps->log2_min_pu_size))

+                                                      s->ps.sps->log2_min_pu_size))

                                                   *

                                                   min_pu_width]).pred_flag ==

                                  PF_INTRA))

@@ -2218,11 +2218,11 @@

                 for (i = 0; i < (0) + (size_max_y); i += 4)

                     if (!

                         ((s->ref->tab_mvf[(((x0 +

-                                             ((-1) << hshift)) >> s->sps->

+                                             ((-1) << hshift)) >> s->ps.sps->

                                             log2_min_pu_size)) + (((y0 +

                                                                     ((i) <<

                                                                      vshift))

-                                                                   >> s->sps->

+                                                                   >> s->ps.sps->

                                                                    log2_min_pu_size))

                                           * min_pu_width]).pred_flag ==

                          PF_INTRA))

@@ -2247,12 +2247,12 @@

                      i > (size_max_y - 1) - (size_max_y); i -= 4)

                     if (!

                         ((s->ref->tab_mvf[(((x0 +

-                                             ((-1) << hshift)) >> s->sps->

+                                             ((-1) << hshift)) >> s->ps.sps->

                                             log2_min_pu_size)) + (((y0 +

                                                                     ((i -

                                                                       3) <<

                                                                      vshift))

-                                                                   >> s->sps->

+                                                                   >> s->ps.sps->

                                                                    log2_min_pu_size))

                                           * min_pu_width]).pred_flag ==

                          PF_INTRA))

@@ -2261,11 +2261,11 @@

                         a = ((left[i - 3]) * 0x01010101U);

                 if (!

                     ((s->ref->tab_mvf[(((x0 +

-                                         ((-1) << hshift)) >> s->sps->

+                                         ((-1) << hshift)) >> s->ps.sps->

                                         log2_min_pu_size)) + (((y0 + ((-1)

                                                                       <<

                                                                       vshift))

-                                                               >> s->sps->

+                                                               >> s->ps.sps->

                                                                log2_min_pu_size))

                                       * min_pu_width]).pred_flag == PF_INTRA))

                     left[-1] = left[0];

@@ -2281,12 +2281,12 @@

                      i > (size_max_y - 1) - (size_max_y); i -= 4)

                     if (!

                         ((s->ref->tab_mvf[(((x0 +

-                                             ((-1) << hshift)) >> s->sps->

+                                             ((-1) << hshift)) >> s->ps.sps->

                                             log2_min_pu_size)) + (((y0 +

                                                                     ((i -

                                                                       3) <<

                                                                      vshift))

-                                                                   >> s->sps->

+                                                                   >> s->ps.sps->

                                                                    log2_min_pu_size))

                                           * min_pu_width]).pred_flag ==

                          PF_INTRA))

@@ -2300,11 +2300,11 @@

                 for (i = 0; i < (0) + (size_max_x); i += 4)

                     if (!

                         ((s->ref->tab_mvf[(((x0 +

-                                             ((i) << hshift)) >> s->sps->

+                                             ((i) << hshift)) >> s->ps.sps->

                                             log2_min_pu_size)) + (((y0 + ((-1)

                                                                           <<

                                                                           vshift))

-                                                                   >> s->sps->

+                                                                   >> s->ps.sps->

                                                                    log2_min_pu_size))

                                           * min_pu_width]).pred_flag ==

                          PF_INTRA))

@@ -2376,8 +2376,8 @@

     top[-1] = left[-1];

-    if (!s->sps->intra_smoothing_disabled_flag

-        && (c_idx == 0 || s->sps->chroma_format_idc == 3)) {

+    if (!s->ps.sps->intra_smoothing_disabled_flag

+        && (c_idx == 0 || s->ps.sps->chroma_format_idc == 3)) {

         if (mode != INTRA_DC && 16 != 4) {

             int intra_hor_ver_dist_thresh[] = { 7, 1, 0 };

             int min_dist_vert_hor =

@@ -2432,24 +2432,24 @@

     v8i16 mul_val1 = { 1, 2, 3, 4, 5, 6, 7, 8 };

     HEVCLocalContext *lc = s->HEVClc;

     int i;

-    int hshift = s->sps->hshift[c_idx];

-    int vshift = s->sps->vshift[c_idx];

+    int hshift = s->ps.sps->hshift[c_idx];

+    int vshift = s->ps.sps->vshift[c_idx];

     int size_in_luma_h = 32 << hshift;

-    int size_in_tbs_h = size_in_luma_h >> s->sps->log2_min_tb_size;

+    int size_in_tbs_h = size_in_luma_h >> s->ps.sps->log2_min_tb_size;

     int size_in_luma_v = 32 << vshift;

-    int size_in_tbs_v = size_in_luma_v >> s->sps->log2_min_tb_size;

+    int size_in_tbs_v = size_in_luma_v >> s->ps.sps->log2_min_tb_size;

     int x = x0 >> hshift;

     int y = y0 >> vshift;

-    int x_tb = (x0 >> s->sps->log2_min_tb_size) & s->sps->tb_mask;

-    int y_tb = (y0 >> s->sps->log2_min_tb_size) & s->sps->tb_mask;

+    int x_tb = (x0 >> s->ps.sps->log2_min_tb_size) & s->ps.sps->tb_mask;

+    int y_tb = (y0 >> s->ps.sps->log2_min_tb_size) & s->ps.sps->tb_mask;

     int cur_tb_addr =

-        s->pps->min_tb_addr_zs[(y_tb) * (s->sps->tb_mask + 2) + (x_tb)];

+        s->ps.pps->min_tb_addr_zs[(y_tb) * (s->ps.sps->tb_mask + 2) + (x_tb)];

     ptrdiff_t stride = s->frame->linesize[c_idx] / sizeof(uint8_t);

     uint8_t *src = (uint8_t *) s->frame->data[c_idx] + x + y * stride;

-    int min_pu_width = s->sps->min_pu_width;

+    int min_pu_width = s->ps.sps->min_pu_width;

     enum IntraPredMode mode = c_idx ? lc->tu.intra_pred_mode_c :

         lc->tu.intra_pred_mode;

@@ -2465,41 +2465,41 @@

     uint8_t *filtered_top = filtered_top_array + 1;

     int cand_bottom_left = lc->na.cand_bottom_left

         && cur_tb_addr >

-        s->pps->min_tb_addr_zs[((y_tb + size_in_tbs_v) & s->sps->tb_mask) *

-                               (s->sps->tb_mask + 2) + (x_tb - 1)];

+        s->ps.pps->min_tb_addr_zs[((y_tb + size_in_tbs_v) & s->ps.sps->tb_mask) *

+                               (s->ps.sps->tb_mask + 2) + (x_tb - 1)];

     int cand_left = lc->na.cand_left;

     int cand_up_left = lc->na.cand_up_left;

     int cand_up = lc->na.cand_up;

     int cand_up_right = lc->na.cand_up_right

         && cur_tb_addr >

-        s->pps->min_tb_addr_zs[(y_tb - 1) * (s->sps->tb_mask + 2) +

-                               ((x_tb + size_in_tbs_h) & s->sps->tb_mask)];

+        s->ps.pps->min_tb_addr_zs[(y_tb - 1) * (s->ps.sps->tb_mask + 2) +

+                               ((x_tb + size_in_tbs_h) & s->ps.sps->tb_mask)];

     int bottom_left_size =

         (((y0 + 2 * size_in_luma_v) >

-          (s->sps->height) ? (s->sps->height) : (y0 +

+          (s->ps.sps->height) ? (s->ps.sps->height) : (y0 +

                                                  2 * size_in_luma_v)) -

          (y0 + size_in_luma_v)) >> vshift;

     int top_right_size =

         (((x0 + 2 * size_in_luma_h) >

-          (s->sps->width) ? (s->sps->width) : (x0 + 2 * size_in_luma_h)) -

+          (s->ps.sps->width) ? (s->ps.sps->width) : (x0 + 2 * size_in_luma_h)) -

          (x0 + size_in_luma_h)) >> hshift;

-    if (s->pps->constrained_intra_pred_flag == 1) {

-        int size_in_luma_pu_v = ((size_in_luma_v) >> s->sps->log2_min_pu_size);

-        int size_in_luma_pu_h = ((size_in_luma_h) >> s->sps->log2_min_pu_size);

-        int on_pu_edge_x = !(x0 & ((1 << s->sps->log2_min_pu_size) - 1));

-        int on_pu_edge_y = !(y0 & ((1 << s->sps->log2_min_pu_size) - 1));

+    if (s->ps.pps->constrained_intra_pred_flag == 1) {

+        int size_in_luma_pu_v = ((size_in_luma_v) >> s->ps.sps->log2_min_pu_size);

+        int size_in_luma_pu_h = ((size_in_luma_h) >> s->ps.sps->log2_min_pu_size);

+        int on_pu_edge_x = !(x0 & ((1 << s->ps.sps->log2_min_pu_size) - 1));

+        int on_pu_edge_y = !(y0 & ((1 << s->ps.sps->log2_min_pu_size) - 1));

         if (!size_in_luma_pu_h)

             size_in_luma_pu_h++;

         if (cand_bottom_left == 1 && on_pu_edge_x) {

-            int x_left_pu = ((x0 - 1) >> s->sps->log2_min_pu_size);

+            int x_left_pu = ((x0 - 1) >> s->ps.sps->log2_min_pu_size);

             int y_bottom_pu =

-                ((y0 + size_in_luma_v) >> s->sps->log2_min_pu_size);

+                ((y0 + size_in_luma_v) >> s->ps.sps->log2_min_pu_size);

             int max =

                 ((size_in_luma_pu_v) >

-                 (s->sps->min_pu_height -

-                  y_bottom_pu) ? (s->sps->min_pu_height -

+                 (s->ps.sps->min_pu_height -

+                  y_bottom_pu) ? (s->ps.sps->min_pu_height -

                                   y_bottom_pu) : (size_in_luma_pu_v));

             cand_bottom_left = 0;

             for (i = 0; i < max; i += 2)

@@ -2510,12 +2510,12 @@

                      PF_INTRA);

         }

         if (cand_left == 1 && on_pu_edge_x) {

-            int x_left_pu = ((x0 - 1) >> s->sps->log2_min_pu_size);

-            int y_left_pu = ((y0) >> s->sps->log2_min_pu_size);

+            int x_left_pu = ((x0 - 1) >> s->ps.sps->log2_min_pu_size);

+            int y_left_pu = ((y0) >> s->ps.sps->log2_min_pu_size);

             int max =

                 ((size_in_luma_pu_v) >

-                 (s->sps->min_pu_height -

-                  y_left_pu) ? (s->sps->min_pu_height -

+                 (s->ps.sps->min_pu_height -

+                  y_left_pu) ? (s->ps.sps->min_pu_height -

                                 y_left_pu) : (size_in_luma_pu_v));

             cand_left = 0;

             for (i = 0; i < max; i += 2)

@@ -2526,20 +2526,20 @@

                      PF_INTRA);

         }

         if (cand_up_left == 1) {

-            int x_left_pu = ((x0 - 1) >> s->sps->log2_min_pu_size);

-            int y_top_pu = ((y0 - 1) >> s->sps->log2_min_pu_size);

+            int x_left_pu = ((x0 - 1) >> s->ps.sps->log2_min_pu_size);

+            int y_top_pu = ((y0 - 1) >> s->ps.sps->log2_min_pu_size);

             cand_up_left =

                 (s->ref->tab_mvf[(x_left_pu) +

                                  (y_top_pu) * min_pu_width]).pred_flag ==

                 PF_INTRA;

         }

         if (cand_up == 1 && on_pu_edge_y) {

-            int x_top_pu = ((x0) >> s->sps->log2_min_pu_size);

-            int y_top_pu = ((y0 - 1) >> s->sps->log2_min_pu_size);

+            int x_top_pu = ((x0) >> s->ps.sps->log2_min_pu_size);

+            int y_top_pu = ((y0 - 1) >> s->ps.sps->log2_min_pu_size);

             int max =

                 ((size_in_luma_pu_h) >

-                 (s->sps->min_pu_width -

-                  x_top_pu) ? (s->sps->min_pu_width -

+                 (s->ps.sps->min_pu_width -

+                  x_top_pu) ? (s->ps.sps->min_pu_width -

                                x_top_pu) : (size_in_luma_pu_h));

             cand_up = 0;

             for (i = 0; i < max; i += 2)

@@ -2549,13 +2549,13 @@

                                       min_pu_width]).pred_flag == PF_INTRA);

         }

         if (cand_up_right == 1 && on_pu_edge_y) {

-            int y_top_pu = ((y0 - 1) >> s->sps->log2_min_pu_size);

+            int y_top_pu = ((y0 - 1) >> s->ps.sps->log2_min_pu_size);

             int x_right_pu =

-                ((x0 + size_in_luma_h) >> s->sps->log2_min_pu_size);

+                ((x0 + size_in_luma_h) >> s->ps.sps->log2_min_pu_size);

             int max =

                 ((size_in_luma_pu_h) >

-                 (s->sps->min_pu_width -

-                  x_right_pu) ? (s->sps->min_pu_width -

+                 (s->ps.sps->min_pu_width -

+                  x_right_pu) ? (s->ps.sps->min_pu_width -

                                  x_right_pu) : (size_in_luma_pu_h));

             cand_up_right = 0;

             for (i = 0; i < max; i += 2)

@@ -2608,56 +2608,56 @@

         } while (0);

     }

-    if (s->pps->constrained_intra_pred_flag == 1) {

+    if (s->ps.pps->constrained_intra_pred_flag == 1) {

         if (cand_bottom_left || cand_left || cand_up_left || cand_up

             || cand_up_right) {

             int size_max_x =

                 x0 + ((2 * 32) << hshift) <

-                s->sps->width ? 2 * 32 : (s->sps->width - x0) >> hshift;

+                s->ps.sps->width ? 2 * 32 : (s->ps.sps->width - x0) >> hshift;

             int size_max_y =

                 y0 + ((2 * 32) << vshift) <

-                s->sps->height ? 2 * 32 : (s->sps->height - y0) >> vshift;

+                s->ps.sps->height ? 2 * 32 : (s->ps.sps->height - y0) >> vshift;

             int j = 32 + (cand_bottom_left ? bottom_left_size : 0) - 1;

             if (!cand_up_right) {

-                size_max_x = x0 + ((32) << hshift) < s->sps->width ?

-                    32 : (s->sps->width - x0) >> hshift;

+                size_max_x = x0 + ((32) << hshift) < s->ps.sps->width ?

+                    32 : (s->ps.sps->width - x0) >> hshift;

             }

             if (!cand_bottom_left) {

-                size_max_y = y0 + ((32) << vshift) < s->sps->height ?

-                    32 : (s->sps->height - y0) >> vshift;

+                size_max_y = y0 + ((32) << vshift) < s->ps.sps->height ?

+                    32 : (s->ps.sps->height - y0) >> vshift;

             }

             if (cand_bottom_left || cand_left || cand_up_left) {

                 while (j > -1

                        &&

                        !((s->ref->tab_mvf[(((x0 +

-                                             ((-1) << hshift)) >> s->sps->

+                                             ((-1) << hshift)) >> s->ps.sps->

                                             log2_min_pu_size)) + (((y0 +