diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-10 20:22:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-13 13:08:57 +0200 |
| commit | 5bf11223dd8eaee21d0230a285420abc2e248ecf (patch) | |
| tree | f7c31b683cf913a8b1e53632334529d4a587e0f5 | |
| parent | 679e869496ede3cd17369b46e815d3a47458cab4 (diff) | |
| download | android_external_ffmpeg-5bf11223dd8eaee21d0230a285420abc2e248ecf.tar.gz android_external_ffmpeg-5bf11223dd8eaee21d0230a285420abc2e248ecf.tar.bz2 android_external_ffmpeg-5bf11223dd8eaee21d0230a285420abc2e248ecf.zip | |
avcodec/cfhd: Set dimensions unconditionally
Fixes Ticket5215
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 056a4ae771b00645184c639fe9fd6b7217eb6d87)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/cfhd.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index d6d831b6cf..3b2901d8ff 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -425,6 +425,11 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, return ret; } } + ret = ff_set_dimensions(avctx, s->coded_width, s->coded_height); + if (ret < 0) + return ret; + frame.f->width = + frame.f->height = 0; if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) return ret; |