diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 19:02:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 19:02:36 +0200 |
| commit | af72f62d7b2ab00d6f69c0838f662beb566862d8 (patch) | |
| tree | 90aad791bc96b1ac9d55cfa491e15dae236c8216 /libavutil | |
| parent | 4a2fd251f477447cdd4f7ee14f3670a7f1f0c4ed (diff) | |
| parent | 9929b3564c0dca42ed7baa6798ef15b6f0013c83 (diff) | |
Merge commit '9929b3564c0dca42ed7baa6798ef15b6f0013c83'
* commit '9929b3564c0dca42ed7baa6798ef15b6f0013c83':
pthread_frame: simplify the code by using new AVPacket API
Conflicts:
libavcodec/pthread_frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
0 files changed, 0 insertions, 0 deletions