diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-20 21:23:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-20 21:25:37 +0200 |
| commit | 36552345d04258e8496913684a06d293c00047ce (patch) | |
| tree | b4e44a1e113432eb2492849d84912e3715f52957 | |
| parent | 54112629f196473d6f6423accf5c7291972da0de (diff) | |
| parent | d7f530b0d67fe3996dbfa990a47c865e0d1400a2 (diff) | |
| download | ffmpeg-36552345d04258e8496913684a06d293c00047ce.tar.gz | |
Merge commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2'
* commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2':
aviobuf: check context before using it
See: 7441d1ec330da810a0ffd44a02b2fc60add5b719
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/aviobuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index f01ed8843b..da94a4afff 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -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); |