Merge commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1'
* commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1':
  pthreads_frame: Do not leak on failure path
See: 11679e1b90
Merged-by: Michael Niedermayer <michaelni@gmx.at>
			
			
This commit is contained in:
		@@ -651,8 +651,8 @@ int ff_frame_thread_init(AVCodecContext *avctx)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        p->frame = av_frame_alloc();
 | 
					        p->frame = av_frame_alloc();
 | 
				
			||||||
        if (!p->frame) {
 | 
					        if (!p->frame) {
 | 
				
			||||||
            err = AVERROR(ENOMEM);
 | 
					 | 
				
			||||||
            av_freep(©);
 | 
					            av_freep(©);
 | 
				
			||||||
 | 
					            err = AVERROR(ENOMEM);
 | 
				
			||||||
            goto error;
 | 
					            goto error;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user