diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 13:19:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 21:28:41 +0100 |
| commit | 117728cf8ff98942411eb55f6ccc89351f482717 (patch) | |
| tree | 8478f59a8b1ce1a68726e469713382d36ae6dde8 /doc | |
| parent | caf7db0c35e81220431369f0881c831a6deddfac (diff) | |
| download | ffmpeg-117728cf8ff98942411eb55f6ccc89351f482717.tar.gz | |
Merge commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac'
* commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac':
pthread_frame: use the AVFrame API properly.
Conflicts:
libavcodec/pthread_frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 45fd4ec9ef2b3a7074c49cdddac6e7dcc127a874)
Conflicts:
libavcodec/pthread_frame.c
Author of the merged code: Anton Khirnov
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions