Merge commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 18:17:31 +0000 (19:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 18:17:38 +0000 (19:17 +0100)
commitd9d97f9b3374ee740a6f7218aecb0f5d6cec8f57
tree1238ae077d80e859e308480902266ef11c53c867
parent2653e125204569b1e9439ee2671c6ebb23a94b80
parent1a5e9130162b8adc898e5f6aea82b6372d1e4e6c
Merge commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c'

* commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c':
  pthread: avoid copying input packets when possible.

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