diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-19 03:23:50 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-19 03:23:50 +0200 |
| commit | e46317a1db077a7f92ea5db7bb76e6cc899f1a64 (patch) | |
| tree | 077078d79610f76cce2e38217f452a4da2b9287c /libmpcodecs/vd_ffmpeg.c | |
| parent | 186e5a998c8424b3c850b62d6f5755a0928cd64c (diff) | |
| parent | 908286b437f3b8c8564db3c77456d5350588fb17 (diff) | |
| download | mpv-e46317a1db077a7f92ea5db7bb76e6cc899f1a64.tar.bz2 mpv-e46317a1db077a7f92ea5db7bb76e6cc899f1a64.tar.xz | |
Merge svn changes up to r28655
Diffstat (limited to 'libmpcodecs/vd_ffmpeg.c')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index c70da3a9f3..69574e399e 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -560,6 +560,7 @@ static int get_buffer(AVCodecContext *avctx, AVFrame *pic){ mpi= mpcodecs_get_image(sh, type, flags, (width+align)&(~align), (height+align)&(~align)); + if (!mpi) return -1; // ok, let's see what did we get: if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK && |