[FFmpeg-devel] [PATCH] Put vp9_scans and vp9_scans_nb in ro_data.
Michael Niedermayer
michaelni at gmx.at
Sun Nov 3 14:38:16 CET 2013
On Sat, Nov 02, 2013 at 10:05:46PM -0400, Ronald S. Bultje wrote:
> ---
> libavcodec/vp9data.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/vp9data.h b/libavcodec/vp9data.h
> index 502928a..3a8549a 100644
> --- a/libavcodec/vp9data.h
> +++ b/libavcodec/vp9data.h
> @@ -467,7 +467,7 @@ static const int16_t vp9_default_scan_32x32[1024] = {
> 923, 954, 985, 1016, 831, 862, 893, 955, 986, 1017, 863, 894, 987, 1018, 895, 1019, 924, 925, 956, 926, 957, 988, 927, 958, 989, 1020, 959, 990, 1021, 991, 1022, 1023,
> };
>
> -static const int16_t *vp9_scans[5][4] = {
> +static const int16_t * const vp9_scans[5][4] = {
> {
> vp9_default_scan_4x4, vp9_col_scan_4x4,
> vp9_row_scan_4x4, vp9_default_scan_4x4
> @@ -1024,7 +1024,7 @@ static const int16_t vp9_default_scan_32x32_nb[1024][2] = {
> { 990, 959 }, { 1021, 990 }, { 1022, 991 }, { 0, 0 },
> };
>
> -static const int16_t (*vp9_scans_nb[5][4])[2] = {
> +static const int16_t (* const vp9_scans_nb[5][4])[2] = {
> {
> vp9_default_scan_4x4_nb, vp9_col_scan_4x4_nb,
> vp9_row_scan_4x4_nb, vp9_default_scan_4x4_nb
these seem to cause
libavcodec/vp9.c: In function ‘decode_coeffs’:
libavcodec/vp9.c:1907:30: warning: initialization discards ‘const’ qualifier from pointer target type [enabled by default]
libavcodec/vp9.c:1908:33: warning: initialization discards ‘const’ qualifier from pointer target type [enabled by default]
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
The real ebay dictionary, page 1
"Used only once" - "Some unspecified defect prevented a second use"
"In good condition" - "Can be repaird by experienced expert"
"As is" - "You wouldnt want it even if you were payed for it, if you knew ..."
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20131103/0f85a64c/attachment.asc>
More information about the ffmpeg-devel
mailing list