Merge commit '9929b3564c0dca42ed7baa6798ef15b6f0013c83'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 17:02:36 +0000 (19:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 17:02:36 +0000 (19:02 +0200)
commitaf72f62d7b2ab00d6f69c0838f662beb566862d8
tree90aad791bc96b1ac9d55cfa491e15dae236c8216
parent4a2fd251f477447cdd4f7ee14f3670a7f1f0c4ed
parent9929b3564c0dca42ed7baa6798ef15b6f0013c83
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>
libavcodec/pthread_frame.c