
* 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>