Showing the changes to libavcodec (1 of 1 file). Show all
Unified · Split
| @@ -725,7 +725,8 @@ static void set_default_scaling_list_data(ScalingList *sl) · 724 unmodified lines | ||
| 725 | 725 | memcpy(sl->sl[3][5], default_scaling_list_inter, 64); |
| 726 | 726 | } |
| 727 | 727 | |
| 728 | −static int scaling_list_data(GetBitContext *gb, AVCodecContext *avctx, ScalingList *sl, HEVCSPS *sps) | |
| 728 | +static int scaling_list_data(GetBitContext *gb, AVCodecContext *avctx, | |
| 729 | + ScalingList *sl, const HEVCSPS *sps) | |
| 729 | 730 | { |
| 730 | 731 | uint8_t scaling_list_pred_mode_flag; |
| 731 | 732 | uint8_t scaling_list_dc_coef[2][6]; |
| @@ -1412,7 +1413,7 @@ static int colour_mapping_table(GetBitContext *gb, AVCodecContext *avctx, HEVCPP · 680 unmodified lines | ||
| 1412 | 1413 | } |
| 1413 | 1414 | |
| 1414 | 1415 | static int pps_multilayer_extension(GetBitContext *gb, AVCodecContext *avctx, |
| 1415 | − HEVCPPS *pps, HEVCSPS *sps, HEVCVPS *vps) | |
| 1416 | + HEVCPPS *pps, const HEVCSPS *sps, const HEVCVPS *vps) | |
| 1416 | 1417 | { |
| 1417 | 1418 | pps->poc_reset_info_present_flag = get_bits1(gb); |
| 1418 | 1419 | pps->pps_infer_scaling_list_flag = get_bits1(gb); |
| @@ -1483,7 +1484,7 @@ static void delta_dlt(GetBitContext *gb, HEVCPPS *pps) · 64 unmodified lines | ||
| 1483 | 1484 | } |
| 1484 | 1485 | |
| 1485 | 1486 | static int pps_3d_extension(GetBitContext *gb, AVCodecContext *avctx, |
| 1486 | − HEVCPPS *pps, HEVCSPS *sps) | |
| 1487 | + HEVCPPS *pps, const HEVCSPS *sps) | |
| 1487 | 1488 | { |
| 1488 | 1489 | unsigned int pps_depth_layers_minus1; |
| 1489 | 1490 | |
| @@ -1507,7 +1508,7 @@ static int pps_3d_extension(GetBitContext *gb, AVCodecContext *avctx, · 17 unmodified lines | ||
| 1507 | 1508 | } |
| 1508 | 1509 | |
| 1509 | 1510 | static int pps_range_extensions(GetBitContext *gb, AVCodecContext *avctx, |
| 1510 | − HEVCPPS *pps, HEVCSPS *sps) | |
| 1511 | + HEVCPPS *pps, const HEVCSPS *sps) | |
| 1511 | 1512 | { |
| 1512 | 1513 | if (pps->transform_skip_enabled_flag) { |
| 1513 | 1514 | pps->log2_max_transform_skip_block_size = get_ue_golomb_31(gb) + 2; |
| @@ -1547,7 +1548,7 @@ static int pps_range_extensions(GetBitContext *gb, AVCodecContext *avctx, · 33 unmodified lines | ||
| 1547 | 1548 | } |
| 1548 | 1549 | |
| 1549 | 1550 | static int pps_scc_extension(GetBitContext *gb, AVCodecContext *avctx, |
| 1550 | − HEVCPPS *pps, HEVCSPS *sps) | |
| 1551 | + HEVCPPS *pps, const HEVCSPS *sps) | |
| 1551 | 1552 | { |
| 1552 | 1553 | int num_comps, ret; |
| 1553 | 1554 | |
| @@ -1599,7 +1600,7 @@ static int pps_scc_extension(GetBitContext *gb, AVCodecContext *avctx, · 45 unmodified lines | ||
| 1599 | 1600 | } |
| 1600 | 1601 | |
| 1601 | 1602 | static inline int setup_pps(AVCodecContext *avctx, GetBitContext *gb, |
| 1602 | − HEVCPPS *pps, HEVCSPS *sps) | |
| 1603 | + HEVCPPS *pps, const HEVCSPS *sps) | |
| 1603 | 1604 | { |
| 1604 | 1605 | int log2_diff; |
| 1605 | 1606 | int pic_area_in_ctbs; |
| @@ -1733,8 +1734,8 @@ static inline int setup_pps(AVCodecContext *avctx, GetBitContext *gb, · 127 unmodified lines | ||
| 1733 | 1734 | int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx, |
| 1734 | 1735 | HEVCParamSets *ps) |
| 1735 | 1736 | { |
| 1736 | − HEVCSPS *sps = NULL; | |
| 1737 | − HEVCVPS *vps = NULL; | |
| 1737 | + const HEVCSPS *sps = NULL; | |
| 1738 | + const HEVCVPS *vps = NULL; | |
| 1738 | 1739 | int i, ret = 0; |
| 1739 | 1740 | unsigned int pps_id = 0; |
| 1740 | 1741 | ptrdiff_t nal_size; |