Compare commits

..

No commits in common. "57d6898730836ac2006d10bf18396752de092e49" and "643e2e10f980cf99c4e37da027b209dcdc1ac56f" have entirely different histories.

4 changed files with 16 additions and 21 deletions

3
configure vendored
View File

@ -6675,14 +6675,13 @@ EOF
;; ;;
esac esac
check_cc intrinsics_sse2 emmintrin.h "__m128i test = _mm_setzero_si128()"
elif enabled loongarch; then elif enabled loongarch; then
enabled lsx && check_inline_asm lsx '"vadd.b $vr0, $vr1, $vr2"' '-mlsx' && append LSXFLAGS '-mlsx' enabled lsx && check_inline_asm lsx '"vadd.b $vr0, $vr1, $vr2"' '-mlsx' && append LSXFLAGS '-mlsx'
enabled lasx && check_inline_asm lasx '"xvadd.b $xr0, $xr1, $xr2"' '-mlasx' && append LASXFLAGS '-mlasx' enabled lasx && check_inline_asm lasx '"xvadd.b $xr0, $xr1, $xr2"' '-mlasx' && append LASXFLAGS '-mlasx'
fi fi
check_cc intrinsics_neon arm_neon.h "int16x8_t test = vdupq_n_s16(0)" check_cc intrinsics_neon arm_neon.h "int16x8_t test = vdupq_n_s16(0)"
check_cc intrinsics_sse2 emmintrin.h "__m128i test = _mm_setzero_si128()"
check_ldflags -Wl,--as-needed check_ldflags -Wl,--as-needed
check_ldflags -Wl,-z,noexecstack check_ldflags -Wl,-z,noexecstack

View File

@ -59,7 +59,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
return 0; return 0;
} }
static uint16_t get_value(GetBitContext *gb, int16_t codebook) static int16_t get_value(GetBitContext *gb, int16_t codebook)
{ {
const int16_t switch_bits = codebook >> 8; const int16_t switch_bits = codebook >> 8;
const int16_t rice_order = codebook & 0xf; const int16_t rice_order = codebook & 0xf;
@ -83,8 +83,6 @@ static uint16_t get_value(GetBitContext *gb, int16_t codebook)
} }
bits = exp_order + (q << 1) - switch_bits; bits = exp_order + (q << 1) - switch_bits;
if (bits > 32)
return 0; // we do not return a negative error code so that we dont produce out of range values on errors
skip_bits_long(gb, bits); skip_bits_long(gb, bits);
return (b >> (32 - bits)) + return (b >> (32 - bits)) +
((switch_bits + 1) << rice_order) - ((switch_bits + 1) << rice_order) -
@ -99,30 +97,30 @@ static const uint8_t align_tile_w[16] = {
#define DC_CB_MAX 12 #define DC_CB_MAX 12
const uint8_t ff_prores_raw_dc_cb[DC_CB_MAX + 1] = { const uint8_t ff_prores_raw_dc_cb[DC_CB_MAX + 1] = {
0x010, 0x021, 0x032, 0x033, 0x033, 0x033, 0x044, 0x044, 0x044, 0x044, 0x044, 0x044, 0x076, 16, 33, 50, 51, 51, 51, 68, 68, 68, 68, 68, 68, 118,
}; };
#define AC_CB_MAX 94 #define AC_CB_MAX 94
const int16_t ff_prores_raw_ac_cb[AC_CB_MAX + 1] = { const int16_t ff_prores_raw_ac_cb[AC_CB_MAX + 1] = {
0x000, 0x211, 0x111, 0x111, 0x222, 0x222, 0x222, 0x122, 0x122, 0x122, 0, 529, 273, 273, 546, 546, 546, 290, 290, 290, 563, 563,
0x233, 0x233, 0x233, 0x233, 0x233, 0x233, 0x233, 0x233, 0x133, 0x133, 563, 563, 563, 563, 563, 563, 307, 307, 580, 580, 580, 580,
0x244, 0x244, 0x244, 0x244, 0x244, 0x244, 0x244, 0x244, 0x244, 0x244, 0x244, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580, 580,
0x244, 0x244, 0x244, 0x244, 0x244, 0x244, 0x244, 0x244, 0x244, 0x244, 0x244, 580, 580, 580, 580, 580, 580, 853, 853, 853, 853, 853, 853,
0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 853, 853, 853, 853, 853, 853, 853, 853, 853, 853, 853, 853,
0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 853, 853, 853, 853, 853, 853, 853, 853, 853, 853, 853, 853,
0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 853, 853, 853, 853, 853, 853, 853, 853, 853, 853, 853, 853,
0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x355, 0x166, 853, 853, 853, 853, 853, 853, 853, 853, 853, 853, 358
}; };
#define RN_CB_MAX 27 #define RN_CB_MAX 27
const int16_t ff_prores_raw_rn_cb[RN_CB_MAX + 1] = { const int16_t ff_prores_raw_rn_cb[RN_CB_MAX + 1] = {
0x200, 0x100, 0x000, 0x000, 0x211, 0x211, 0x111, 0x111, 0x011, 0x011, 0x021, 0x021, 0x222, 0x022, 512, 256, 0, 0, 529, 529, 273, 273, 17, 17, 33, 33, 546,
0x022, 0x022, 0x022, 0x022, 0x022, 0x022, 0x022, 0x022, 0x022, 0x022, 0x022, 0x032, 0x032, 0x044 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 50, 50, 68,
}; };
#define LN_CB_MAX 14 #define LN_CB_MAX 14
const int16_t ff_prores_raw_ln_cb[LN_CB_MAX + 1] = { const int16_t ff_prores_raw_ln_cb[LN_CB_MAX + 1] = {
0x100, 0x111, 0x222, 0x222, 0x122, 0x122, 0x433, 0x433, 0x233, 0x233, 0x233, 0x233, 0x233, 0x233, 0x033, 256, 273, 546, 546, 290, 290, 1075, 1075, 563, 563, 563, 563, 563, 563, 51
}; };
static int decode_comp(AVCodecContext *avctx, TileContext *tile, static int decode_comp(AVCodecContext *avctx, TileContext *tile,
@ -147,7 +145,7 @@ static int decode_comp(AVCodecContext *avctx, TileContext *tile,
int16_t dc_add = 0; int16_t dc_add = 0;
int16_t dc_codebook; int16_t dc_codebook;
uint16_t ac, rn, ln; int16_t ac, rn, ln;
int16_t ac_codebook = 49; int16_t ac_codebook = 49;
int16_t rn_codebook = 0; int16_t rn_codebook = 0;
int16_t ln_codebook = 66; int16_t ln_codebook = 66;

View File

@ -1011,7 +1011,7 @@ static av_cold int init(AVFilterContext *ctx)
av_log(ctx, AV_LOG_WARNING, "Multiple texts provided, will use text_source only\n"); av_log(ctx, AV_LOG_WARNING, "Multiple texts provided, will use text_source only\n");
av_free(s->text); av_free(s->text);
} }
s->text = av_mallocz((AV_DETECTION_BBOX_LABEL_NAME_MAX_SIZE + 1) * s->text = av_mallocz(AV_DETECTION_BBOX_LABEL_NAME_MAX_SIZE *
(AV_NUM_DETECTION_BBOX_CLASSIFY + 1)); (AV_NUM_DETECTION_BBOX_CLASSIFY + 1));
if (!s->text) if (!s->text)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);

View File

@ -167,8 +167,6 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave)
if ((ret = ff_tee_parse_slave_options(avf, slave, &options, &filename)) < 0) if ((ret = ff_tee_parse_slave_options(avf, slave, &options, &filename)) < 0)
return ret; return ret;
tee_slave->on_fail = DEFAULT_SLAVE_FAILURE_POLICY;
#define CONSUME_OPTION(option, field, action) do { \ #define CONSUME_OPTION(option, field, action) do { \
AVDictionaryEntry *en = av_dict_get(options, option, NULL, 0); \ AVDictionaryEntry *en = av_dict_get(options, option, NULL, 0); \
if (en) { \ if (en) { \