diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-21 02:28:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-21 02:31:41 +0100 |
| commit | 2d7f139155dd734860d0731d095db1db9e9550fd (patch) | |
| tree | 6a9e0b92c1f3ead1656a60ba391709aefa12cb57 /doc/metadata.texi | |
| parent | b589b8a7042fa0ba296e0f080c30d853da56b925 (diff) | |
| parent | 56eded8bc7bccdf14245bae3a45b0fecf9d9d122 (diff) | |
| download | ffmpeg-2d7f139155dd734860d0731d095db1db9e9550fd.tar.gz | |
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>
Diffstat (limited to 'doc/metadata.texi')
0 files changed, 0 insertions, 0 deletions