diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2019-03-14 00:53:45 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2019-03-14 00:53:45 +0000 |
| commit | 0e1a5d09ca94e8cea060143b7f201824cd1f3a17 (patch) | |
| tree | e8ba2fb31eb2976e533a5cc40a6051891eb72273 /multimedia | |
| parent | 600546f7aab6e8ede6fd1f4dd2e9e46685425185 (diff) | |
Notes
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/aom/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/aom/distinfo | 6 | ||||
| -rw-r--r-- | multimedia/aom/files/patch-av1_encoder_encodeframe.c | 34 |
3 files changed, 39 insertions, 5 deletions
diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile index d5ba6ba34c47..378e3a691cc5 100644 --- a/multimedia/aom/Makefile +++ b/multimedia/aom/Makefile @@ -2,8 +2,8 @@ PORTNAME= aom DISTVERSIONPREFIX= v -DISTVERSION= 1.0.0-1448 -DISTVERSIONSUFFIX= -g559efba4a +DISTVERSION= 1.0.0-1461 +DISTVERSIONSUFFIX= -g2ff3bc5bc CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo index 158b9bc4e25c..eadc60d6bb5c 100644 --- a/multimedia/aom/distinfo +++ b/multimedia/aom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552349623 -SHA256 (jbeich-aom-v1.0.0-1448-g559efba4a_GH0.tar.gz) = 27446c7ac2a745da0e980abb2798e0cd44322d5d079709adbcf27c0f2d19e00c -SIZE (jbeich-aom-v1.0.0-1448-g559efba4a_GH0.tar.gz) = 3198074 +TIMESTAMP = 1552520292 +SHA256 (jbeich-aom-v1.0.0-1461-g2ff3bc5bc_GH0.tar.gz) = cc63841d333b6c4ae2ca5a3ea142c4ef7d983052ec96e4190c663f1469ab968e +SIZE (jbeich-aom-v1.0.0-1461-g2ff3bc5bc_GH0.tar.gz) = 3208965 diff --git a/multimedia/aom/files/patch-av1_encoder_encodeframe.c b/multimedia/aom/files/patch-av1_encoder_encodeframe.c new file mode 100644 index 000000000000..66773c8fed82 --- /dev/null +++ b/multimedia/aom/files/patch-av1_encoder_encodeframe.c @@ -0,0 +1,34 @@ +av1/encoder/encodeframe.c:3873:33: error: use of undeclared identifier 'ref_frame_flag_list'; did you mean 'av1_ref_frame_flag_list'? + assert(cpi->ref_frame_flags & ref_frame_flag_list[LAST_FRAME] || + ^~~~~~~~~~~~~~~~~~~ + av1_ref_frame_flag_list +/usr/include/assert.h:54:21: note: expanded from macro 'assert' +#define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \ + ^ +av1/encoder/encoder.h:1282:22: note: 'av1_ref_frame_flag_list' declared here +static const uint8_t av1_ref_frame_flag_list[REF_FRAMES] = { 0, + ^ +av1/encoder/encodeframe.c:3874:33: error: use of undeclared identifier 'ref_frame_flag_list'; did you mean 'av1_ref_frame_flag_list'? + cpi->ref_frame_flags & ref_frame_flag_list[ALTREF_FRAME]); + ^~~~~~~~~~~~~~~~~~~ + av1_ref_frame_flag_list +/usr/include/assert.h:54:21: note: expanded from macro 'assert' +#define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \ + ^ +av1/encoder/encoder.h:1282:22: note: 'av1_ref_frame_flag_list' declared here +static const uint8_t av1_ref_frame_flag_list[REF_FRAMES] = { 0, + ^ + +--- av1/encoder/encodeframe.c.orig 2019-03-13 23:38:12 UTC ++++ av1/encoder/encodeframe.c +@@ -3870,8 +3870,8 @@ static void firstpass_simple_motion_search_features( + AV1_COMP *const cpi, MACROBLOCK *x, PC_TREE *pc_tree, int mi_row, + int mi_col, BLOCK_SIZE bsize, float *features) { + assert(mi_size_wide[bsize] == mi_size_high[bsize]); +- assert(cpi->ref_frame_flags & ref_frame_flag_list[LAST_FRAME] || +- cpi->ref_frame_flags & ref_frame_flag_list[ALTREF_FRAME]); ++ assert(cpi->ref_frame_flags & av1_ref_frame_flag_list[LAST_FRAME] || ++ cpi->ref_frame_flags & av1_ref_frame_flag_list[ALTREF_FRAME]); + + // Setting up motion search + const int ref_list[] = { LAST_FRAME, ALTREF_FRAME }; |