Merge commit '56eded8bc7bccdf14245bae3a45b0fecf9d9d122' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Dec 2013 01:28:44 +0000 (02:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Dec 2013 01:31:41 +0000 (02:31 +0100)
commit2d7f139155dd734860d0731d095db1db9e9550fd
tree6a9e0b92c1f3ead1656a60ba391709aefa12cb57
parentb589b8a7042fa0ba296e0f080c30d853da56b925
parent56eded8bc7bccdf14245bae3a45b0fecf9d9d122
Merge commit '56eded8bc7bccdf14245bae3a45b0fecf9d9d122' into release/1.1

* commit '56eded8bc7bccdf14245bae3a45b0fecf9d9d122':
  mpeg4videodec: split initializing static tables into a separate function
  x86: ac3dsp: Remove 3dnow version of ff_ac3_extract_exponents
  pthread: Avoid spurious wakeups

Conflicts:
libavcodec/mpeg4videodec.c
tests/fate/ac3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg4videodec.c
libavcodec/pthread.c
libavcodec/x86/ac3dsp.asm
libavcodec/x86/ac3dsp_init.c
tests/fate/ac3.mak