Merge commit 'fc85646ad495f3418042468da415af73a7a07334'
authorJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 22:04:26 +0000 (19:04 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 22:07:14 +0000 (19:07 -0300)
commitc5fd47fa8a300fc51489a47da94041609545803c
treea368ed1d5d532ee5137823273de02d513710c990
parentbceb3d0f8621dd4dcdab2148e29d1473165d9cb6
parentfc85646ad495f3418042468da415af73a7a07334
Merge commit 'fc85646ad495f3418042468da415af73a7a07334'

* commit 'fc85646ad495f3418042468da415af73a7a07334':
  libopusdec: fix out-of-bounds read
  libschroedingerdec: fix leaking of framewithpts
  libschroedingerdec: don't produce empty frames

This commit is a noop, see

a86ebbf7f641bc797002ddea7fb517759722cd1b
3c0328d58d98664b05efdd377d3fe66a569d385e
8c8f543b81aa2b50bb6a6cfd370a0061281492a3

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/libschroedingerdec.c