virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-24 17:12:34 +02:00
Code Issues Releases Activity

avformat/av1, hevc: Make *_buf-functions return 0 on success

Browse Source 
The output size is already returned via a pointer argument, so there is
no need to return it via the ordinary return value as well. The
rationale behind this is to not poison the return value on success.
It also unifies the behaviour of the *_buf-functions for AVC, AV1 and
HEVC.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-01-23 17:08:30 +01:00 committed by James Almer
parent 680cd59bb2
commit 22ec35a428
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/av1.c
View File

@ -76,7 +76,7 @@ int ff_av1_filter_obus_buf(const uint8_t *buf, uint8_t **out, int *size)
av_freep(out); av_freep(out);
*size = avio_close_dyn_buf(pb, out); *size = avio_close_dyn_buf(pb, out);
return ret; return 0;
} }
static inline void uvlc(GetBitContext *gb) static inline void uvlc(GetBitContext *gb)

4
libavformat/av1.h
View File

@ -66,8 +66,8 @@ int ff_av1_filter_obus(AVIOContext *pb, const uint8_t *buf, int size);
* @param size size of the input data buffer. The size of the resulting output * @param size size of the input data buffer. The size of the resulting output
data buffer will be written here data buffer will be written here
* *
* @return the amount of bytes written in case of success, a negative AVERROR * @return 0 in case of success, a negative AVERROR code in case of failure.
* code in case of failure. On failure, out and size are unchanged * On failure, out and size are unchanged
*/ */
int ff_av1_filter_obus_buf(const uint8_t *buf, uint8_t **out, int *size); int ff_av1_filter_obus_buf(const uint8_t *buf, uint8_t **out, int *size);

2
libavformat/hevc.c
View File

@ -1062,7 +1062,7 @@ int ff_hevc_annexb2mp4_buf(const uint8_t *buf_in, uint8_t **buf_out,
*size = avio_close_dyn_buf(pb, buf_out); *size = avio_close_dyn_buf(pb, buf_out);
return ret; return 0;
} }
int ff_isom_write_hvcc(AVIOContext *pb, const uint8_t *data, int ff_isom_write_hvcc(AVIOContext *pb, const uint8_t *data,

4
libavformat/hevc.h
View File

@ -71,8 +71,8 @@ int ff_hevc_annexb2mp4(AVIOContext *pb, const uint8_t *buf_in,
* or to discard them (non-zero) * or to discard them (non-zero)
* @param ps_count address of the variable where the number of discarded * @param ps_count address of the variable where the number of discarded
* parameter set NAL units shall be written, may be NULL * parameter set NAL units shall be written, may be NULL
* @return the amount (in bytes) of data written in case of success, a negative * @return 0 in case of success, a negative value corresponding to an AVERROR
* value corresponding to an AVERROR code in case of failure * code in case of failure
*/ */
int ff_hevc_annexb2mp4_buf(const uint8_t *buf_in, uint8_t **buf_out, int ff_hevc_annexb2mp4_buf(const uint8_t *buf_in, uint8_t **buf_out,
int *size, int filter_ps, int *ps_count); int *size, int filter_ps, int *ps_count);