Commit 36552345 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd7f530b0'

* commit 'd7f530b0':
  aviobuf: check context before using it

See: 7441d1ecMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 54112629 d7f530b0
......@@ -1097,7 +1097,6 @@ int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer)
*pbuffer = NULL;
return 0;
}
d = s->opaque;
/* don't attempt to pad fixed-size packet buffers */
if (!s->max_packet_size) {
......@@ -1107,6 +1106,7 @@ int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer)
avio_flush(s);
d = s->opaque;
*pbuffer = d->buffer;
size = d->size;
av_free(d);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment