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/avcodec.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/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1cab5c5950..77d5e2290c 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -4675,7 +4675,13 @@ enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const en * @} */ +#if FF_API_SET_DIMENSIONS +/** + * @deprecated this function is not supposed to be used from outside of lavc + */ +attribute_deprecated void avcodec_set_dimensions(AVCodecContext *s, int width, int height); +#endif /** * Put a string representing the codec tag codec_tag in buf. |