Merge commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 12:19:50 +0000 (13:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 12:25:17 +0000 (13:25 +0100)
commit45fd4ec9ef2b3a7074c49cdddac6e7dcc127a874
tree10f5a0ed6327888262be8d0a55b8bd5572fcc639
parentb8667bccad2eec64e5dbf24fab16767f0f7ea234
parentd351ef47d0e0ccb7de96b37f137c16b2885580ac
Merge commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac'

* commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac':
  pthread_frame: use the AVFrame API properly.

Conflicts:
libavcodec/pthread_frame.c

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