diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 16:06:10 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 16:14:55 +0300 |
| commit | 2f1a518d4572bdad2cacd8e8bc25df93acffa9b4 (patch) | |
| tree | 7529956ac00a3789a4aa3310fd6c80518a6773f5 /libmpcodecs | |
| parent | 9b68a49d0132bbe08d3a9bf7a19276801ac415aa (diff) | |
| parent | d852b590a2aefad3c2050cf2741b4c51af8735ca (diff) | |
| download | mpv-2f1a518d4572bdad2cacd8e8bc25df93acffa9b4.tar.bz2 mpv-2f1a518d4572bdad2cacd8e8bc25df93acffa9b4.tar.xz | |
Merge svn changes up to r31211
The merged cache2.c changes are known to have problems. Will merge
further fixes to them before merging this to the master branch.
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_theora.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libmpcodecs/vd_theora.c b/libmpcodecs/vd_theora.c index 70a5e1d525..86fb5dc0dd 100644 --- a/libmpcodecs/vd_theora.c +++ b/libmpcodecs/vd_theora.c @@ -167,6 +167,10 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags) yuv_buffer yuv; mp_image_t* mpi; + // no delayed frames + if (!data || !len) + return NULL; + memset (&op, 0, sizeof (op)); op.bytes = len; op.packet = data; |