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/truemotion1.c | |
| parent | 329898aa45f5f8e8b89386ecd40b8db96746d53c (diff) | |
| parent | 9e500efdbe0deeff1602500ebc229a0a6b6bb1a2 (diff) | |
| download | ffmpeg-0dceefc5fa81a6c851b51acab695a8c149ec8e3b.tar.gz | |
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/truemotion1.c')
| -rw-r--r-- | libavcodec/truemotion1.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index ed79959240..660ecf5413 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -412,6 +412,8 @@ static int truemotion1_decode_header(TrueMotion1Context *s) if ((ret = ff_set_dimensions(s->avctx, s->w, s->h)) < 0) return ret; + ff_set_sar(s->avctx, s->avctx->sample_aspect_ratio); + av_fast_malloc(&s->vert_pred, &s->vert_pred_size, s->avctx->width * sizeof(unsigned int)); if (!s->vert_pred) return AVERROR(ENOMEM); |