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)
* commit '9929b3564c0dca42ed7baa6798ef15b6f0013c83':
  pthread_frame: simplify the code by using new AVPacket API

Conflicts:
libavcodec/pthread_frame.c

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

Simple merge