diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:08:13 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:08:13 +0200 |
commit | cae8f469fee7c32685f04a2b507251119d6875ef (patch) | |
tree | 1f0ca385d3ab050c391736551a370184a24dcbf0 /libavcodec/ppc/h264chroma_init.c | |
parent | ebd99ff112e8993330dd39959c22dfe1ab17d5c0 (diff) | |
parent | 38282149b6ce8f4b8361e3b84542ba9aa8a1f32f (diff) | |
download | ffmpeg-streaming-cae8f469fee7c32685f04a2b507251119d6875ef.zip ffmpeg-streaming-cae8f469fee7c32685f04a2b507251119d6875ef.tar.gz |
Merge commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f'
* commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f':
ppc: More consistent arch initialization
Conflicts:
libavcodec/fft.h
libavcodec/mpegaudiodsp.c
libavcodec/mpegaudiodsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ppc/h264chroma_init.c')
0 files changed, 0 insertions, 0 deletions