diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 22:20:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 22:20:28 +0200 |
| commit | 0dceefc5fa81a6c851b51acab695a8c149ec8e3b (patch) | |
| tree | d26bf3f752e6fa622d14f44e091930004b2d12de /libavcodec/internal.h | |
| parent | 329898aa45f5f8e8b89386ecd40b8db96746d53c (diff) | |
| parent | 9e500efdbe0deeff1602500ebc229a0a6b6bb1a2 (diff) | |
Merge commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2'
* commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2':
Add av_image_check_sar() and use it to validate SAR
Conflicts:
libavcodec/dpx.c
libavcodec/dvdec.c
libavcodec/ffv1dec.c
libavcodec/utils.c
libavutil/version.h
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 9afbba7b44..e00aad9431 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -241,6 +241,12 @@ const uint8_t *avpriv_find_start_code(const uint8_t *p, int ff_set_dimensions(AVCodecContext *s, int width, int height); /** + * Check that the provided sample aspect ratio is valid and set it on the codec + * context. + */ +int ff_set_sar(AVCodecContext *avctx, AVRational sar); + +/** * Add or update AV_FRAME_DATA_MATRIXENCODING side data. */ int ff_side_data_update_matrix_encoding(AVFrame *frame, |