Merge commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 17:16:38 +0000 (18:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 17:17:33 +0000 (18:17 +0100)
* commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1':
  pthreads_frame: Do not leak on failure path

See: 11679e1b90f6e52a3643efb45d06ea5adf65098a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/pthread_frame.c

Simple merge