[FFmpeg-cvslog] avcodec/hevc_sei: reorder some parameters in static functions
James Almer
git at videolan.org
Tue Oct 31 17:56:52 EET 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Oct 31 12:38:36 2017 -0300| [9e2b0f32e905cc51d5e559aa4f80970e55438049] | committer: James Almer
avcodec/hevc_sei: reorder some parameters in static functions
Cosmetic change skipped in 0b30cb8dae5e7edb2a5f35900547321499c217f1
by mistake.
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9e2b0f32e905cc51d5e559aa4f80970e55438049
---
libavcodec/hevc_sei.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c
index 1ea67836b0..6ce1669820 100644
--- a/libavcodec/hevc_sei.c
+++ b/libavcodec/hevc_sei.c
@@ -272,8 +272,8 @@ static int decode_nal_sei_alternative_transfer(HEVCSEIAlternativeTransfer *s, Ge
return 0;
}
-static int decode_nal_sei_prefix(GetBitContext *gb, HEVCSEI *s, const HEVCParamSets *ps,
- int type, int size, void *logctx)
+static int decode_nal_sei_prefix(GetBitContext *gb, void *logctx, HEVCSEI *s,
+ const HEVCParamSets *ps, int type, int size)
{
switch (type) {
case 256: // Mismatched value from HM 8.1
@@ -301,8 +301,8 @@ static int decode_nal_sei_prefix(GetBitContext *gb, HEVCSEI *s, const HEVCParamS
}
}
-static int decode_nal_sei_suffix(GetBitContext *gb, HEVCSEI *s,
- int type, int size, void *logctx)
+static int decode_nal_sei_suffix(GetBitContext *gb, void *logctx, HEVCSEI *s,
+ int type, int size)
{
switch (type) {
case HEVC_SEI_TYPE_DECODED_PICTURE_HASH:
@@ -314,9 +314,8 @@ static int decode_nal_sei_suffix(GetBitContext *gb, HEVCSEI *s,
}
}
-static int decode_nal_sei_message(GetBitContext *gb, HEVCSEI *s,
- const HEVCParamSets *ps, int nal_unit_type,
- void *logctx)
+static int decode_nal_sei_message(GetBitContext *gb, void *logctx, HEVCSEI *s,
+ const HEVCParamSets *ps, int nal_unit_type)
{
int payload_type = 0;
int payload_size = 0;
@@ -333,9 +332,9 @@ static int decode_nal_sei_message(GetBitContext *gb, HEVCSEI *s,
payload_size += byte;
}
if (nal_unit_type == HEVC_NAL_SEI_PREFIX) {
- return decode_nal_sei_prefix(gb, s, ps, payload_type, payload_size, logctx);
+ return decode_nal_sei_prefix(gb, logctx, s, ps, payload_type, payload_size);
} else { /* nal_unit_type == NAL_SEI_SUFFIX */
- return decode_nal_sei_suffix(gb, s, payload_type, payload_size, logctx);
+ return decode_nal_sei_suffix(gb, logctx, s, payload_type, payload_size);
}
}
@@ -350,7 +349,7 @@ int ff_hevc_decode_nal_sei(GetBitContext *gb, void *logctx, HEVCSEI *s,
int ret;
do {
- ret = decode_nal_sei_message(gb, s, ps, type, logctx);
+ ret = decode_nal_sei_message(gb, logctx, s, ps, type);
if (ret < 0)
return ret;
} while (more_rbsp_data(gb));
More information about the ffmpeg-cvslog
mailing list