]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'c71c80f53b6a63fd6360d9de5a262f9e7c85681f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Mar 2013 10:50:26 +0000 (11:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Mar 2013 10:50:33 +0000 (11:50 +0100)
* commit 'c71c80f53b6a63fd6360d9de5a262f9e7c85681f':
  pthread: unref already decoded frames when flushing the decoder

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/pthread.c

Simple merge