diff options
| author | Michael Niedermayer | 2014-03-10 23:38:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer | 2014-03-10 23:38:01 +0100 |
| commit | 7f90055470609ce0eebae38a69ea2310dffae134 (patch) | |
| tree | 781fc34c0bba5b71820788390112d74f524200ad /libavformat/hevc.h | |
| parent | 182c674f68139f5613147fd9e0a7f196dc9c8bea (diff) | |
| parent | 34bbc81de8a49fbddb92b76dc733f40890480b2b (diff) | |
Merge commit '34bbc81de8a49fbddb92b76dc733f40890480b2b'
* commit '34bbc81de8a49fbddb92b76dc733f40890480b2b':
lavf: simplify ff_hevc_annexb2mp4_buf
Conflicts:
libavformat/hevc.c
libavformat/hevc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hevc.h')
| -rw-r--r-- | libavformat/hevc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/hevc.h b/libavformat/hevc.h index c687f1b1fc..796eaf40b1 100644 --- a/libavformat/hevc.h +++ b/libavformat/hevc.h @@ -71,8 +71,8 @@ int ff_hevc_annexb2mp4(AVIOContext *pb, const uint8_t *buf_in, * or to discard them (non-zero) * @param ps_count address of the variable where the number of discarded * parameter set NAL units shall be written, may be NULL - * @return >=0 in case of success, a negative value corresponding to an AVERROR - * code in case of failure + * @return the amount (in bytes) of data written in case of success, a negative + * value corresponding to an AVERROR code in case of failure */ int ff_hevc_annexb2mp4_buf(const uint8_t *buf_in, uint8_t **buf_out, int *size, int filter_ps, int *ps_count); |