diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 13:07:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 13:07:15 +0100 |
| commit | 7b91e9cf5dc7b46216aa4da79943aecf9425ab04 (patch) | |
| tree | 24e303e1b752801434c49e4516fc3d02a55c500f /libavcodec/internal.h | |
| parent | f62dfed3de400fa02f770ea8a0b750fc297336bf (diff) | |
| parent | 7644f5a80787c9b608b82873604805d7e38a6a18 (diff) | |
Merge commit '7644f5a80787c9b608b82873604805d7e38a6a18'
* commit '7644f5a80787c9b608b82873604805d7e38a6a18':
lavc: replace avcodec_set_dimensions with ff_set_dimensions
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/internal.h')
| -rw-r--r-- | libavcodec/internal.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 96976e1ae9..bfeb0962fd 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -225,4 +225,10 @@ const uint8_t *avpriv_find_start_code(const uint8_t *p, const uint8_t *end, uint32_t *state); +/** + * Check that the provided frame dimensions are valid and set them on the codec + * context. + */ +int ff_set_dimensions(AVCodecContext *s, int width, int height); + #endif /* AVCODEC_INTERNAL_H */ |