diff options
| author | Michael Niedermayer <[email protected]> | 2013-05-02 12:47:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-05-02 12:49:23 +0200 |
| commit | 0beff42823223659d75e7382d41a1e2a954bbfad (patch) | |
| tree | 4363263395b78eef5d92bbefa133b0534fb4485c /ffmpeg.c | |
| parent | 6021615bbe393381f23b34a7cd0dcfd1a42687ba (diff) | |
| parent | 0671adbb18f79e834d5c1e68a322d75e4524a8dc (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
id3v2: K&R formatting cosmetics
ppc: Only compile AltiVec FFT assembly when AltiVec is enabled
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions