diff options
| author | Max Kellermann <max@duempel.org> | 2011-12-13 21:57:44 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-12-13 21:57:44 +0100 |
| commit | aa4f45b9a56779355f15f867dce9ab0759cb5f7a (patch) | |
| tree | e0793dfab38b5540a02c8a8e3d4f2612fe2c3faa /src/decoder | |
| parent | 006b8fa3f07e948cbd277e91546dd815769d7a5e (diff) | |
| parent | 96ad5b84446be0bf603895adaf0ec2e97bee11aa (diff) | |
Merge branch 'v0.16.x'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'src/decoder')
| -rw-r--r-- | src/decoder/mp4ff_decoder_plugin.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/decoder/mp4ff_decoder_plugin.c b/src/decoder/mp4ff_decoder_plugin.c index 6475211a..89f65670 100644 --- a/src/decoder/mp4ff_decoder_plugin.c +++ b/src/decoder/mp4ff_decoder_plugin.c @@ -94,6 +94,12 @@ mp4_read(void *user_data, void *buffer, uint32_t length) { struct mp4ff_input_stream *mis = user_data; + if (length == 0) + /* libmp4ff is known to attempt to read 0 bytes - make + this a special case, because the input_stream API + would not allow this */ + return 0; + return decoder_read(mis->decoder, mis->input_stream, buffer, length); } |