diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:31:32 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:31:32 +0100 |
| commit | f64b53f2bf5f3f43402564bf57a8555a709d012c (patch) | |
| tree | 05a8fe0d4b141f54dc10798bcf1f89228fdfcb5b /libavcodec/intrax8.h | |
| parent | c29ac4abb8183513555ff2ee90666c6eac7cbf4f (diff) | |
| parent | 0372e73f917e72c40b09270f771046fc142be4a7 (diff) | |
| download | ffmpeg-f64b53f2bf5f3f43402564bf57a8555a709d012c.tar.gz | |
Merge commit '0372e73f917e72c40b09270f771046fc142be4a7'
* commit '0372e73f917e72c40b09270f771046fc142be4a7':
intrax8: Check and propagate errors from ff_intrax8_common_init
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/intrax8.h')
| -rw-r--r-- | libavcodec/intrax8.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h index 4d99c8d84a..c2e45017f2 100644 --- a/libavcodec/intrax8.h +++ b/libavcodec/intrax8.h @@ -64,8 +64,9 @@ typedef struct IntraX8Context { * Requires valid MpegEncContext with valid s->mb_width before calling. * @param w pointer to IntraX8Context * @param s pointer to MpegEncContext of the parent codec + * @return 0 on success, a negative AVERROR value on error */ -void ff_intrax8_common_init(IntraX8Context *w, MpegEncContext *const s); +int ff_intrax8_common_init(IntraX8Context *w, MpegEncContext *const s); /** * Destroy IntraX8 frame structure. |