diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 13:19:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 13:25:17 +0100 |
| commit | 45fd4ec9ef2b3a7074c49cdddac6e7dcc127a874 (patch) | |
| tree | 10f5a0ed6327888262be8d0a55b8bd5572fcc639 /libavutil/aes.c | |
| parent | b8667bccad2eec64e5dbf24fab16767f0f7ea234 (diff) | |
| parent | d351ef47d0e0ccb7de96b37f137c16b2885580ac (diff) | |
| download | ffmpeg-45fd4ec9ef2b3a7074c49cdddac6e7dcc127a874.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>
Diffstat (limited to 'libavutil/aes.c')
0 files changed, 0 insertions, 0 deletions