generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '6cf27b550d66963b89b5917568b85c4b49fb18ba' into release/2.4

Browse Source 
* commit '6cf27b550d66963b89b5917568b85c4b49fb18ba':
  aviobuf: check context before using it

See: 7441d1ec33
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-01-18 01:02:25 +01:00
parent d6f4e475a1 6cf27b550d
commit 153a012384
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/aviobuf.c
View File

@@ -1098,7 +1098,6 @@ int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer)
*pbuffer = NULL; *pbuffer = NULL;
return 0; return 0;
} }
d = s->opaque;
/* don't attempt to pad fixed-size packet buffers */ /* don't attempt to pad fixed-size packet buffers */
if (!s->max_packet_size) { if (!s->max_packet_size) {
@@ -1108,6 +1107,7 @@ int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer)
avio_flush(s); avio_flush(s);
d = s->opaque;
*pbuffer = d->buffer; *pbuffer = d->buffer;
size = d->size; size = d->size;
av_free(d); av_free(d);