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/h263dec.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 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 5186042ab0..7266cc7a37 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -526,6 +526,8 @@ retry: if (ret < 0) return ret; + ff_set_sar(avctx, avctx->sample_aspect_ratio); + if ((ret = ff_MPV_common_frame_size_change(s))) return ret; } |