[FFmpeg-cvslog] Merge commit '56eded8bc7bccdf14245bae3a45b0fecf9d9d122' into release/1.1

Michael Niedermayer git at videolan.org
Sat Dec 21 02:41:27 CET 2013


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 21 02:28:44 2013 +0100| [2d7f139155dd734860d0731d095db1db9e9550fd] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d7f139155dd734860d0731d095db1db9e9550fd
---





More information about the ffmpeg-cvslog mailing list