diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-21 00:20:28 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-21 00:20:28 +0400 |
commit | 0dceefc5fa81a6c851b51acab695a8c149ec8e3b (patch) | |
tree | d26bf3f752e6fa622d14f44e091930004b2d12de /libavutil/imgutils.c | |
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 'libavutil/imgutils.c')
-rw-r--r-- | libavutil/imgutils.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 274099b75f..00b203182b 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -27,7 +27,9 @@ #include "internal.h" #include "intreadwrite.h" #include "log.h" +#include "mathematics.h" #include "pixdesc.h" +#include "rational.h" void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4], const AVPixFmtDescriptor *pixdesc) @@ -239,6 +241,27 @@ int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *lo return AVERROR(EINVAL); } +int av_image_check_sar(unsigned int w, unsigned int h, AVRational sar) +{ + int64_t scaled_dim; + + if (!sar.den) + return AVERROR(EINVAL); + + if (!sar.num || sar.num == sar.den) + return 0; + + if (sar.num < sar.den) + scaled_dim = av_rescale_rnd(w, sar.num, sar.den, AV_ROUND_ZERO); + else + scaled_dim = av_rescale_rnd(h, sar.den, sar.num, AV_ROUND_ZERO); + + if (scaled_dim > 0) + return 0; + + return AVERROR(EINVAL); +} + void av_image_copy_plane(uint8_t *dst, int dst_linesize, const uint8_t *src, int src_linesize, int bytewidth, int height) |