Merge commit '6cf27b550d66963b89b5917568b85c4b49fb18ba' into release/2.4
* commit '6cf27b550d66963b89b5917568b85c4b49fb18ba':
  aviobuf: check context before using it
See: 7441d1ec33
Merged-by: Michael Niedermayer <michaelni@gmx.at>
			
			
This commit is contained in:
		@@ -1098,7 +1098,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) {
 | 
			
		||||
@@ -1108,6 +1107,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);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user