Merge commit '9cbf2d78f0a9c19129e7a70b2281a450d386c6d9'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 16:00:01 +0000 (17:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 16:01:20 +0000 (17:01 +0100)
commit8367bc6be890472efee13e191eac5d7214eab2d2
tree90f57f958b054cc84539864f39f6a7aa83609519
parent30056fd0be8ace0754e0568787bb4c18ea49edeb
parent9cbf2d78f0a9c19129e7a70b2281a450d386c6d9
Merge commit '9cbf2d78f0a9c19129e7a70b2281a450d386c6d9'

* commit '9cbf2d78f0a9c19129e7a70b2281a450d386c6d9':
  pthread_frame: unref decoded frames on failure

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