Merge commit '1d1df82093fdacb2cbc443c70c80f8f801002d28' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Mar 2014 21:30:42 +0000 (22:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Mar 2014 21:30:54 +0000 (22:30 +0100)
* commit '1d1df82093fdacb2cbc443c70c80f8f801002d28':
  pthread_frame: flush all threads on flush, not just the first one

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

Simple merge