Merge commit 'cf7bb6ceb1da7682aa54989f83d81c67a5e6790d' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 20:02:03 +0000 (22:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 20:02:08 +0000 (22:02 +0200)
* commit 'cf7bb6ceb1da7682aa54989f83d81c67a5e6790d':
  Revert "pthread: flush all threads on flush, not just the first one"

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

Simple merge